X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=win32%2FTransforms%2FTransforms.vcproj;h=f94e18e5e8a8401a1dbaf733ae85d748e83e9f25;hb=73b43b9b549a75fb0015c825df68abd95705a67c;hp=198dc6e800b82c674bc11326e8dfdb49cce1230c;hpb=ea966dda1b29a519290df1c98af44f5a131e3ff0;p=oota-llvm.git

diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index 198dc6e800b..f94e18e5e8a 100644
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -10,16 +10,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
@@ -87,8 +90,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;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_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)/Transforms.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)/Transforms.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"
@@ -107,6 +249,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -208,10 +351,6 @@
 					RelativePath="..\..\lib\Transforms\Ipo\DeadTypeElimination.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Ipo\ExtractFunction.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Ipo\GlobalDCE.cpp"
 					>
@@ -228,10 +367,6 @@
 					RelativePath="..\..\lib\Transforms\Ipo\Inliner.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Ipo\Inliner.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Ipo\InlineSimple.cpp"
 					>
@@ -261,15 +396,15 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Ipo\SimplifyLibCalls.cpp"
+					RelativePath="..\..\lib\Transforms\IPO\StripDeadPrototypes.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\IPO\StripDeadPrototypes.cpp"
+					RelativePath="..\..\lib\Transforms\Ipo\StripSymbols.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Ipo\StripSymbols.cpp"
+					RelativePath="..\..\lib\Transforms\IPO\StructRetPromotion.cpp"
 					>
 				</File>
 			</Filter>
@@ -296,10 +431,6 @@
 					RelativePath="..\..\lib\Transforms\Scalar\ConstantProp.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Scalar\CorrelatedExprs.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\DCE.cpp"
 					>
@@ -328,10 +459,18 @@
 					RelativePath="..\..\lib\Transforms\Scalar\InstructionCombining.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Scalar\JumpThreading.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\LICM.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Scalar\LoopDeletion.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\LoopIndexSplit.cpp"
 					>
@@ -353,11 +492,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Scalar\LowerGC.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Scalar\LowerPacked.cpp"
+					RelativePath="..\..\lib\Transforms\Scalar\MemCpyOptimizer.cpp"
 					>
 				</File>
 				<File
@@ -372,6 +507,10 @@
 					RelativePath="..\..\lib\Transforms\Scalar\Reg2Mem.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Scalar\Scalar.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\ScalarReplAggregates.cpp"
 					>
@@ -381,9 +520,31 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Scalar\SimplifyCFG.cpp"
+					RelativePath="..\..\lib\Transforms\Scalar\SimplifyCFGPass.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Scalar\SimplifyLibCalls.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\TailDuplication.cpp"
 					>
@@ -464,10 +625,6 @@
 					RelativePath="..\..\lib\Transforms\Utils\LowerInvoke.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Utils\LowerSelect.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\LowerSwitch.cpp"
 					>
@@ -499,11 +656,31 @@
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\UnifyFunctionExitNodes.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\UnrollLoop.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\ValueMapper.cpp"
 					>