From: Steve Naroff <snaroff@apple.com>
Date: Mon, 26 Jan 2009 22:03:42 +0000 (+0000)
Subject: More updates to VC proj...
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=609eef258fb9cb2491109abf12d4c307e05294ae;p=oota-llvm.git

More updates to VC proj...


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63050 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 6119a2bf703..3f5550fe3bf 100644
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -340,6 +340,10 @@
 				RelativePath="..\..\lib\Analysis\ConstantFolding.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\lib\Analysis\DbgInfoPrinter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\lib\Analysis\DebugInfo.cpp"
 				>
diff --git a/win32/AsmParser/AsmParser.vcproj b/win32/AsmParser/AsmParser.vcproj
index 782ca2a889c..96ca6d172b6 100644
--- a/win32/AsmParser/AsmParser.vcproj
+++ b/win32/AsmParser/AsmParser.vcproj
@@ -90,11 +90,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -111,17 +111,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser"
-				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"
@@ -157,11 +162,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -178,22 +183,17 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser"
-				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"
@@ -310,48 +310,8 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\lib\AsmParser\llvmAsmParser.y"
+				RelativePath="..\..\lib\AsmParser\LLParser.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Bisoning $(InputFileName)"
-						CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
-						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Bisoning $(InputFileName)"
-						CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
-						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Bisoning $(InputFileName)"
-						CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
-						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Bisoning $(InputFileName)"
-						CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath) ..\..\lib\AsmParser&#x0D;&#x0A;"
-						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output;..\..\lib\AsmParser\$(InputName).h"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\lib\AsmParser\Parser.cpp"
@@ -379,14 +339,6 @@
 		<Filter
 			Name="Generated Files"
 			>
-			<File
-				RelativePath=".\llvmAsmParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvmAsmParser.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>