diff options
| author | Chuck Rose III <cfr@adobe.com> | 2008-04-03 20:28:40 +0000 |
|---|---|---|
| committer | Chuck Rose III <cfr@adobe.com> | 2008-04-03 20:28:40 +0000 |
| commit | 6d41b1c05d0af26e7ba8389b94a9811de5ea48b3 (patch) | |
| tree | 57a77eb3807c946b863e38866f88d407b9fb6037 /win32 | |
| parent | 51dd8c9224e58c12a846327bd8cfab7b639a9905 (diff) | |
| download | llvm-6d41b1c05d0af26e7ba8389b94a9811de5ea48b3.tar.gz llvm-6d41b1c05d0af26e7ba8389b94a9811de5ea48b3.tar.bz2 llvm-6d41b1c05d0af26e7ba8389b94a9811de5ea48b3.tar.xz | |
Removed a deleted file from the VStudio System project. Also added custom build commands to engage 64 bit assembler for compilation callback on 64 bit configurations only.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49188 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/System/System.vcproj | 26 | ||||
| -rw-r--r-- | win32/x86/x86.vcproj | 22 |
2 files changed, 33 insertions, 15 deletions
diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj index 457340f151..c450e93c21 100644 --- a/win32/System/System.vcproj +++ b/win32/System/System.vcproj @@ -90,7 +90,7 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Debug|x64" OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" @@ -111,17 +111,22 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="..\..\include;.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_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" - RuntimeLibrary="2" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb" + BrowseInformation="1" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -157,7 +162,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|Win32" OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" @@ -178,22 +183,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="..\..\include;.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS" StringPooling="true" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb" - BrowseInformation="1" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -322,10 +322,6 @@ > </File> <File - RelativePath="..\..\lib\System\MappedFile.cpp" - > - </File> - <File RelativePath="..\..\lib\System\Memory.cpp" > </File> diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj index 1d894f9350..b47d559433 100644 --- a/win32/x86/x86.vcproj +++ b/win32/x86/x86.vcproj @@ -370,6 +370,28 @@ > </File> <File + RelativePath="..\..\lib\Target\X86\X86CompilationCallback_Win64.asm" + > + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64.exe /c /nologo /Fo "$(IntDir)X86CompilationCallback_Win64.obj" /Zi $(InputPath)" + Outputs=""$(IntDir)X86CompilationCallback_Win64.obj"" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64.exe /c /nologo /Fo "$(IntDir)X86CompilationCallback_Win64.obj" /Zi $(InputPath)" + Outputs=""$(IntDir)X86CompilationCallback_Win64.obj"" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.cpp" > </File> |