Make it compile on VC2005:

- update VC projects.
- Add an overload to llvm::Stream for <<, since std::hex and std::dec have type std::ios_base& (*)(std::ios_base&) in VC++. (templating the function don't work, due to ambiguities)
- add ../ on several include in X86/AsmPrinter/

llvm-svn: 54898

1 files changed, 41 insertions, 25 deletions

diff --git a/llvm/win32/x86/x86.vcproj b/llvm/win32/x86/x86.vcproj
index 7001947b812..78801743eee 100644
--- a/llvm/win32/x86/x86.vcproj
+++ b/llvm/win32/x86/x86.vcproj
@@ -90,7 +90,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -111,22 +111,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_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_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"
@@ -162,7 +157,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -183,17 +178,22 @@
 			/>
 			<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;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"
@@ -320,7 +320,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -331,7 +331,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -354,14 +354,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\lib\Target\X86\X86AsmPrinter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\Target\X86\X86ATTAsmPrinter.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\lib\Target\X86\X86CodeEmitter.cpp"
 				>
 			</File>
@@ -416,10 +408,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\lib\Target\X86\X86IntelAsmPrinter.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\lib\Target\X86\X86ISelDAGToDAG.cpp"
 				>
 			</File>
@@ -447,6 +435,34 @@
 				RelativePath="..\..\lib\Target\X86\X86TargetMachine.cpp"
 				>
 			</File>
+			<Filter
+				Name="AsmPrinter"
+				>
+				<File
+					RelativePath="..\..\lib\Target\X86\AsmPrinter\X86AsmPrinter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\lib\Target\X86\AsmPrinter\X86AsmPrinter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\lib\Target\X86\AsmPrinter\X86ATTAsmPrinter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\lib\Target\X86\AsmPrinter\X86ATTAsmPrinter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\lib\Target\X86\AsmPrinter\X86IntelAsmPrinter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\lib\Target\X86\AsmPrinter\X86IntelAsmPrinter.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"