[llvm-commits] [llvm] r49188 - in /llvm/trunk/win32: System/System.vcproj x86/x86.vcproj

[Chuck Rose III]

Author: cfr
Date: Thu Apr  3 15:28:40 2008
New Revision: 49188

URL: http://llvm.org/viewvc/llvm-project?rev=49188&view=rev
Log:
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.

Modified:
    llvm/trunk/win32/System/System.vcproj
    llvm/trunk/win32/x86/x86.vcproj

Modified: llvm/trunk/win32/System/System.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/System/System.vcproj?rev=49188&r1=49187&r2=49188&view=diff

==============================================================================
--- llvm/trunk/win32/System/System.vcproj (original)
+++ llvm/trunk/win32/System/System.vcproj Thu Apr  3 15:28:40 2008
@@ -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>

Modified: llvm/trunk/win32/x86/x86.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/x86/x86.vcproj?rev=49188&r1=49187&r2=49188&view=diff

==============================================================================
--- llvm/trunk/win32/x86/x86.vcproj (original)
+++ llvm/trunk/win32/x86/x86.vcproj Thu Apr  3 15:28:40 2008
@@ -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>