diff options
| author | Chuck Rose III <cfr@adobe.com> | 2007-11-21 00:37:56 +0000 |
|---|---|---|
| committer | Chuck Rose III <cfr@adobe.com> | 2007-11-21 00:37:56 +0000 |
| commit | 07b57d26263057daa703ddda980ac16e6da8c950 (patch) | |
| tree | 46af7738f4d5b6cf541c32a36f7c32004909b0d6 /llvm/win32/AsmParser | |
| parent | f265bec4b0d33ecd281916228224947a2c6b1e2a (diff) | |
| download | bcm5719-llvm-07b57d26263057daa703ddda980ac16e6da8c950.tar.gz bcm5719-llvm-07b57d26263057daa703ddda980ac16e6da8c950.zip | |
This change does a couple of things. First it gets the Visual Studio builds working.
I added the lexing files to the VStudio projects and removed the .l files from the
VStudio projects. There was a problem with use of strtoll in TGLexer.cpp and Chris
suggested switching to strtol, so that's included here.
Additionally, this checkin adds minimal x64 builds to the VStudio builds. Build issues
related to x64 in the windows specific files for DynamicLibrary.inc and Singals.inc
are worked around, but not ultimately solved. Binaries used to be stored in
...\win32\{Debug|Release}
but are now kept in
...\win32\bin\{win32|x64}\{Debug|Release}
intermediate files will continue to be stored in the individual project directories under
win32.
Some names will likely change in the future to reflect that the vstudio projects
are no longer 32-bit only, but I wanted to get things up and running today so kept away
from bigger restructuring.
llvm-svn: 44260
Diffstat (limited to 'llvm/win32/AsmParser')
| -rw-r--r-- | llvm/win32/AsmParser/AsmParser.vcproj | 193 |
1 files changed, 168 insertions, 25 deletions
diff --git a/llvm/win32/AsmParser/AsmParser.vcproj b/llvm/win32/AsmParser/AsmParser.vcproj index 8e0a1f0973a..f44a9c2a41a 100644 --- a/llvm/win32/AsmParser/AsmParser.vcproj +++ b/llvm/win32/AsmParser/AsmParser.vcproj @@ -11,14 +11,17 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\Debug" - IntermediateDirectory="Debug" + OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -88,8 +91,147 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\Release" - IntermediateDirectory="Release" + OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS" + StringPooling="true" + RuntimeLibrary="2" + ForceConformanceInForLoopScope="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + DisableSpecificWarnings="4355,4146,4800" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/AsmParser.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS" + StringPooling="true" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + ForceConformanceInForLoopScope="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb" + BrowseInformation="1" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + DisableSpecificWarnings="4355,4146,4800" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/AsmParser.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -108,6 +250,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -163,16 +306,20 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\lib\AsmParser\Lexer.l" + RelativePath="..\..\lib\AsmParser\LLLexer.cpp" + > + </File> + <File + RelativePath="..\..\lib\AsmParser\llvmAsmParser.y" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Flexing $(InputFileName)" - CommandLine="..\doflex.cmd debug $(InputName) $(InputPath)
" - Outputs="$(InputName).cpp" + Description="Bisoning $(InputFileName)" + CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath) ..\..\lib\AsmParser
" + Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h" /> </FileConfiguration> <FileConfiguration @@ -180,33 +327,29 @@ > <Tool Name="VCCustomBuildTool" - Description="Flexing $(InputFileName)" - CommandLine="..\doflex.cmd release $(InputName) $(InputPath)
" - Outputs="$(InputName).cpp" + Description="Bisoning $(InputFileName)" + CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath) ..\..\lib\AsmParser
" + Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\AsmParser\llvmAsmParser.y" - > <FileConfiguration - Name="Debug|Win32" + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" Description="Bisoning $(InputFileName)" - CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath)
" - Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output" + CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath) ..\..\lib\AsmParser
" + Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h" /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Release|x64" > <Tool Name="VCCustomBuildTool" Description="Bisoning $(InputFileName)" - CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath)
" - Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output" + CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath) ..\..\lib\AsmParser
" + Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h" /> </FileConfiguration> </File> @@ -221,6 +364,10 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File + RelativePath="..\..\lib\AsmParser\LLLexer.h" + > + </File> + <File RelativePath="..\..\include\llvm\Assembly\Parser.h" > </File> @@ -233,10 +380,6 @@ Name="Generated Files" > <File - RelativePath="Lexer.cpp" - > - </File> - <File RelativePath="llvmAsmParser.cpp" > </File> |
