Updates to the VStudio project files:

1. Switch from VStudio 2k3 to VStudio 2k5

2. All pdb files now will be placed as $(OutputDir)/$(ProjectName).pdb.  This puts them alongside the 
binaries with the same base name as the binary.  If you need to copy the results of your llvm build 
into another project's tree, this will simplify that process.

3. Recent files added to the tree were added to the proejects within the VStudio project

4. Project build dependency order fixed so that the build can take place in one pass.  A generated
file was not being built at the correct time, causing a build error in about half the projects until
the build was run a second time.

Note you will need flex and bison installed an in your path in order to build properly.

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

1 files changed, 244 insertions, 124 deletions

diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 7cb8137079..8f3a61ee7a 100644
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -1,105 +1,157 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="VMCore"
 	ProjectGUID="{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}"
 	RootNamespace="VMCore"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
-				StringPooling="TRUE"
-				MinimalRebuild="TRUE"
+				StringPooling="true"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				BrowseInformation="1"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4355,4146,4800"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/VMCore.lib"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355,4146,4800"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/VMCore.lib"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.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;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355,4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/VMCore.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/VMCore.lib"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -108,235 +160,303 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath="..\..\lib\VMCore\AsmWriter.cpp">
+				RelativePath="..\..\lib\VMCore\AsmWriter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\BasicBlock.cpp">
+				RelativePath="..\..\lib\VMCore\BasicBlock.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ConstantFold.cpp">
+				RelativePath="..\..\lib\VMCore\ConstantFold.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Constants.cpp">
+				RelativePath="..\..\lib\VMCore\Constants.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Dominators.cpp">
+				RelativePath="..\..\lib\VMCore\Dominators.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Function.cpp">
+				RelativePath="..\..\lib\VMCore\Function.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Globals.cpp">
+				RelativePath="..\..\lib\VMCore\Globals.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\InlineAsm.cpp">
+				RelativePath="..\..\lib\VMCore\InlineAsm.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Instruction.cpp">
+				RelativePath="..\..\lib\VMCore\Instruction.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Instructions.cpp">
+				RelativePath="..\..\lib\VMCore\Instructions.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\IntrinsicInst.cpp">
+				RelativePath="..\..\lib\VMCore\IntrinsicInst.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Intrinsics.td">
+				RelativePath="..\..\include\llvm\Intrinsics.td"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="echo Building $(InputFileName) code emitter with tblgen
-..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
-"
+						CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen&#x0D;&#x0A;"
 						AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
-						Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
+						Outputs="$(SolutionDir)llvm\intrinsics.gen"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="echo Building $(InputFileName) code emitter with tblgen
-..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
-"
+						CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen&#x0D;&#x0A;"
 						AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
-						Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
+						Outputs="$(SolutionDir)llvm\intrinsics.gen"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\LeakDetector.cpp">
+				RelativePath="..\..\lib\VMCore\LeakDetector.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Mangler.cpp">
+				RelativePath="..\..\lib\VMCore\Mangler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Module.cpp">
+				RelativePath="..\..\lib\VMCore\Module.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ModuleProvider.cpp">
+				RelativePath="..\..\lib\VMCore\ModuleProvider.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Pass.cpp">
+				RelativePath="..\..\lib\VMCore\Pass.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\PassManager.cpp">
+				RelativePath="..\..\lib\VMCore\PassManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Type.cpp">
+				RelativePath="..\..\lib\VMCore\Type.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\TypeSymbolTable.cpp">
+				RelativePath="..\..\lib\VMCore\TypeSymbolTable.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Value.cpp">
+				RelativePath="..\..\lib\VMCore\Value.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ValueSymbolTable.cpp">
+				RelativePath="..\..\lib\VMCore\ValueSymbolTable.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ValueTypes.cpp">
+				RelativePath="..\..\lib\VMCore\ValueTypes.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\Verifier.cpp">
+				RelativePath="..\..\lib\VMCore\Verifier.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath="..\..\include\llvm\AbstractTypeUser.h">
+				RelativePath="..\..\include\llvm\AbstractTypeUser.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Argument.h">
+				RelativePath="..\..\include\llvm\Argument.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Assembly\AsmAnnotationWriter.h">
+				RelativePath="..\..\include\llvm\Assembly\AsmAnnotationWriter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\BasicBlock.h">
+				RelativePath="..\..\include\llvm\BasicBlock.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\CallGraphSCCPass.h">
+				RelativePath="..\..\include\llvm\CallGraphSCCPass.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Constant.h">
+				RelativePath="..\..\include\llvm\Constant.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ConstantFold.h">
+				RelativePath="..\..\lib\VMCore\ConstantFold.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Constants.h">
+				RelativePath="..\..\include\llvm\Constants.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\DerivedTypes.h">
+				RelativePath="..\..\include\llvm\DerivedTypes.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Function.h">
+				RelativePath="..\..\include\llvm\Function.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\GlobalAlias.h">
+				RelativePath="..\..\include\llvm\GlobalAlias.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\GlobalValue.h">
+				RelativePath="..\..\include\llvm\GlobalValue.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\GlobalVariable.h">
+				RelativePath="..\..\include\llvm\GlobalVariable.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\InlineAsm.h">
+				RelativePath="..\..\include\llvm\InlineAsm.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\InstrTypes.h">
+				RelativePath="..\..\include\llvm\InstrTypes.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Instruction.def">
+				RelativePath="..\..\include\llvm\Instruction.def"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Instruction.h">
+				RelativePath="..\..\include\llvm\Instruction.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Instructions.h">
+				RelativePath="..\..\include\llvm\Instructions.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\IntrinsicInst.h">
+				RelativePath="..\..\include\llvm\IntrinsicInst.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Intrinsics.h">
+				RelativePath="..\..\include\llvm\Intrinsics.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\IntrinsicsPowerPC.td">
+				RelativePath="..\..\include\llvm\IntrinsicsPowerPC.td"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\IntrinsicsX86.td">
+				RelativePath="..\..\include\llvm\IntrinsicsX86.td"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Linker.h">
+				RelativePath="..\..\include\llvm\Linker.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Module.h">
+				RelativePath="..\..\include\llvm\Module.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\ModuleProvider.h">
+				RelativePath="..\..\include\llvm\ModuleProvider.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\ParameterAttributes.h">
+				RelativePath="..\..\include\llvm\ParameterAttributes.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Pass.h">
+				RelativePath="..\..\include\llvm\Pass.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\PassAnalysisSupport.h">
+				RelativePath="..\..\include\llvm\PassAnalysisSupport.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\PassManager.h">
+				RelativePath="..\..\include\llvm\PassManager.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\PassManagers.h">
+				RelativePath="..\..\include\llvm\PassManagers.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\PassSupport.h">
+				RelativePath="..\..\include\llvm\PassSupport.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Assembly\PrintModulePass.h">
+				RelativePath="..\..\include\llvm\Assembly\PrintModulePass.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\SymbolTableListTraits.h">
+				RelativePath="..\..\include\llvm\SymbolTableListTraits.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\SymbolTableListTraitsImpl.h">
+				RelativePath="..\..\lib\VMCore\SymbolTableListTraitsImpl.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Type.h">
+				RelativePath="..\..\include\llvm\Type.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\TypeSymbolTable.h">
+				RelativePath="..\..\include\llvm\TypeSymbolTable.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Use.h">
+				RelativePath="..\..\include\llvm\Use.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\User.h">
+				RelativePath="..\..\include\llvm\User.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Value.h">
+				RelativePath="..\..\include\llvm\Value.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\ValueSymbolTable.h">
+				RelativePath="..\..\include\llvm\ValueSymbolTable.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\Assembly\Writer.h">
+				RelativePath="..\..\include\llvm\Assembly\Writer.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Generated Tablegen Files"
-			Filter="">
+			>
 			<File
-				RelativePath="..\llvm\intrinsics.gen">
+				RelativePath="..\llvm\intrinsics.gen"
+				>
 			</File>
 		</Filter>
 	</Files>