projects / oota-llvm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
"Just a small update for the project files for adding a missing preprocessor
[oota-llvm.git] / win32 / AsmParser / AsmParser.vcproj
diff --git a/win32/AsmParser/AsmParser.vcproj b/win32/AsmParser/AsmParser.vcproj
index 862d976b66dbc3f64ebfb28d22eb1b38736ea485..2b7cb40ed3fdc5c57cc11380a2d8fb0254d66031 100644 (file)
--- a/win32/AsmParser/AsmParser.vcproj
+++ b/win32/AsmParser/AsmParser.vcproj
@@ -11,16 +11,19 @@
                <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"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -42,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               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"
@@ -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;..\common.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,11 +250,12 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               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"
@@ -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)&#x0D;&#x0A;"
-                                               Outputs="$(InputName).cpp"
+                                               Description="Bisoning $(InputFileName)"
+                                               CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
+                                               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)&#x0D;&#x0A;"
-                                               Outputs="$(InputName).cpp"
+                                               Description="Bisoning $(InputFileName)"
+                                               CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
+                                               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)&#x0D;&#x0A;"
-                                               Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"
+                                               CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
+                                               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)&#x0D;&#x0A;"
-                                               Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"
+                                               CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
+                                               Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h"
                                        />
                                </FileConfiguration>
                        </File>
@@ -220,6 +363,10 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
+                       <File
+                               RelativePath="..\..\lib\AsmParser\LLLexer.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Assembly\Parser.h"
                                >
@@ -233,15 +380,11 @@
                        Name="Generated Files"
                        >
                        <File
-                               RelativePath="Lexer.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="llvmAsmParser.cpp"
+                               RelativePath="..\..\lib\AsmParser\llvmAsmParser.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="llvmAsmParser.h"
+                               RelativePath="..\..\lib\AsmParser\llvmAsmParser.h"
                                >
                        </File>
                </Filter>
C/C++ LLVM-based compilers that forbids OOTA behaviors