X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=win32%2FSupport%2FSupport.vcproj;h=b85cf8dddaecb6b46eb54a02ab1dcb1d3630caee;hb=f6af087cb93d949d333977246cc34353589260df;hp=1a8804f88f0a55046c79514b9f791bfcc710c6e6;hpb=7c2c2e71edf27bd23fd37eb479caa6abf5a2c9cc;p=oota-llvm.git

diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index 1a8804f88f0..b85cf8dddae 100644
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -4,22 +4,26 @@
 	Version="8.00"
 	Name="support"
 	ProjectGUID="{28AA9146-3482-4F41-9CC6-407B1D258508}"
+	RootNamespace="support"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
 		<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
@@ -41,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;.."
-				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"
@@ -49,10 +53,11 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				BrowseInformation="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				DisableSpecificWarnings="4355,4146,4800"
 			/>
 			<Tool
@@ -86,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;.."
+				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)/support.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;.."
+				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)/support.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"
@@ -106,16 +250,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\include;.."
-				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"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -167,10 +313,18 @@
 				RelativePath="..\..\lib\Support\Annotation.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\lib\Support\APFloat.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\APInt.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\lib\Support\APSInt.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\CommandLine.cpp"
 				>
@@ -223,14 +377,15 @@
 				RelativePath="..\..\lib\Support\SlowOperationInformer.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -258,6 +413,10 @@
 				RelativePath="..\..\lib\Support\StringMap.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\lib\Support\StringPool.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\SystemUtils.cpp"
 				>
@@ -276,6 +435,14 @@
 				RelativePath="..\..\include\llvm\Support\AIXDataTypesFix.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\Alignment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\AlignOf.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\Allocator.h"
 				>
@@ -297,19 +464,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Support\CommandLine.h"
+				RelativePath="..\..\include\llvm\Support\CHelpers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Support\Compiler.h"
+				RelativePath="..\..\include\llvm\Support\CommandLine.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Support\ConstantRange.h"
+				RelativePath="..\..\include\llvm\Support\Compiler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Support\DataTypes.h"
+				RelativePath="..\..\include\llvm\Support\ConstantRange.h"
 				>
 			</File>
 			<File
@@ -392,6 +559,10 @@
 				RelativePath="..\..\include\llvm\Support\PluginLoader.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\Registry.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\SlowOperationInformer.h"
 				>
@@ -404,6 +575,10 @@
 				RelativePath="..\..\include\llvm\Support\Streams.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\StringPool.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\SystemUtils.h"
 				>
@@ -424,10 +599,6 @@
 				RelativePath="..\..\include\llvm\Support\type_traits.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\Support\TypeInfo.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="ADT"
@@ -444,10 +615,18 @@
 				RelativePath="..\..\include\llvm\ADT\BitVector.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\DataTypes.h.in"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Adt\DenseMap.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\DenseSet.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Adt\DepthFirstIterator.h"
 				>
@@ -480,6 +659,14 @@
 				RelativePath="..\..\include\llvm\Adt\ilist"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\ImmutableMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\ImmutableSet.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\ADT\IndexedMap.h"
 				>