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
diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index 3486f79..d71f1eb 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -1,104 +1,156 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="CodeGen"
ProjectGUID="{08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}"
- 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"/>
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4355,4146,4800"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/CodeGen.lib"/>
+ OutputFile="$(OutDir)/CodeGen.lib"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <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="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/CodeGen.lib"/>
+ OutputFile="$(OutDir)/CodeGen.lib"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -107,243 +159,341 @@
<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\CodeGen\AsmPrinter.cpp">
+ RelativePath="..\..\lib\CodeGen\AsmPrinter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\BranchFolding.cpp">
+ RelativePath="..\..\lib\CodeGen\BranchFolding.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\DwarfWriter.cpp">
+ RelativePath="..\..\lib\CodeGen\DwarfWriter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\ELFWriter.cpp">
+ RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\ELFWriter.h">
+ RelativePath="..\..\lib\CodeGen\ELFWriter.h"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp">
+ RelativePath="..\..\lib\CodeGen\IfConversion.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\LiveInterval.cpp">
+ RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\LiveIntervalAnalysis.cpp">
+ RelativePath="..\..\lib\CodeGen\LiveInterval.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\LiveVariables.cpp">
+ RelativePath="..\..\lib\CodeGen\LiveIntervalAnalysis.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\LLVMTargetMachine.cpp">
+ RelativePath="..\..\lib\CodeGen\LiveVariables.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp">
+ RelativePath="..\..\lib\CodeGen\LLVMTargetMachine.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachineFunction.cpp">
+ RelativePath="..\..\lib\CodeGen\LowerSubregs.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachineInstr.cpp">
+ RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachineModuleInfo.cpp">
+ RelativePath="..\..\lib\CodeGen\MachineFunction.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp">
+ RelativePath="..\..\lib\CodeGen\MachineInstr.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachOWriter.cpp">
+ RelativePath="..\..\lib\CodeGen\MachineModuleInfo.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\MachOWriter.h">
+ RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\Passes.cpp">
+ RelativePath="..\..\lib\CodeGen\MachOWriter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\PHIElimination.cpp">
+ RelativePath="..\..\lib\CodeGen\MachOWriter.h"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\PrologEpilogInserter.cpp">
+ RelativePath="..\..\lib\CodeGen\Passes.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\RegAllocLinearScan.cpp">
+ RelativePath="..\..\lib\CodeGen\PHIElimination.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\RegAllocLocal.cpp">
+ RelativePath="..\..\lib\CodeGen\PostRASchedulerList.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp">
+ RelativePath="..\..\lib\CodeGen\PrologEpilogInserter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\RegisterScavenging.cpp">
+ RelativePath="..\..\lib\CodeGen\RegAllocBigBlock.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp">
+ RelativePath="..\..\lib\CodeGen\RegAllocLinearScan.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\UnreachableBlockElim.cpp">
+ RelativePath="..\..\lib\CodeGen\RegAllocLocal.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\VirtRegMap.cpp">
+ RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\lib\CodeGen\RegisterScavenging.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\lib\CodeGen\SimpleRegisterCoalescing.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\lib\CodeGen\UnreachableBlockElim.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\lib\CodeGen\VirtRegMap.cpp"
+ >
</File>
<Filter
Name="SelectionDAG"
- Filter="">
+ >
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\CallingConvLower.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\CallingConvLower.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeDAG.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeDAG.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAG.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAG.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSimple.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSimple.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAG.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAG.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGISel.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGISel.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGPrinter.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGPrinter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\SelectionDAG\TargetLowering.cpp">
+ RelativePath="..\..\lib\CodeGen\SelectionDAG\TargetLowering.cpp"
+ >
</File>
</Filter>
</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\CodeGen\AsmPrinter.h">
+ RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h">
+ RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\DwarfWriter.h">
+ RelativePath="..\..\include\llvm\CodeGen\DwarfWriter.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\FileWriters.h">
+ RelativePath="..\..\include\llvm\CodeGen\FileWriters.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\InstrScheduling.h">
+ RelativePath="..\..\include\llvm\CodeGen\InstrScheduling.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h">
+ RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\LinkAllCodegenComponents.h">
+ RelativePath="..\..\include\llvm\CodeGen\LinkAllCodegenComponents.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\LiveInterval.h">
+ RelativePath="..\..\include\llvm\CodeGen\LiveInterval.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\LiveIntervalAnalysis.h">
+ RelativePath="..\..\include\llvm\CodeGen\LiveIntervalAnalysis.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\LiveVariables.h">
+ RelativePath="..\..\include\llvm\CodeGen\LiveVariables.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineBasicBlock.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineBasicBlock.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineCodeEmitter.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineCodeEmitter.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineConstantPool.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineConstantPool.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineFrameInfo.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineFrameInfo.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineFunction.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineFunction.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineFunctionPass.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineFunctionPass.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineInstr.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineInstr.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineInstrBuilder.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineInstrBuilder.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineJumpTableInfo.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineJumpTableInfo.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineModuleInfo.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineModuleInfo.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\MachORelocation.h">
+ RelativePath="..\..\include\llvm\CodeGen\MachORelocation.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\Passes.h">
+ RelativePath="..\..\include\llvm\CodeGen\Passes.h"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\PhysRegTracker.h">
+ RelativePath="..\..\lib\CodeGen\PhysRegTracker.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
+ RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\RegisterScavenging.h">
+ RelativePath="..\..\include\llvm\CodeGen\RegisterScavenging.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
+ RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\SchedGraphCommon.h">
+ RelativePath="..\..\include\llvm\CodeGen\SchedGraphCommon.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\ScheduleDAG.h">
+ RelativePath="..\..\include\llvm\CodeGen\ScheduleDAG.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\SchedulerRegistry.h">
+ RelativePath="..\..\include\llvm\CodeGen\SchedulerRegistry.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\SelectionDAG.h">
+ RelativePath="..\..\include\llvm\CodeGen\SelectionDAG.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\SelectionDAGISel.h">
+ RelativePath="..\..\include\llvm\CodeGen\SelectionDAGISel.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\SelectionDAGNodes.h">
+ RelativePath="..\..\include\llvm\CodeGen\SelectionDAGNodes.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\SSARegMap.h">
+ RelativePath="..\..\include\llvm\CodeGen\SSARegMap.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\CodeGen\ValueTypes.h">
+ RelativePath="..\..\include\llvm\CodeGen\ValueTypes.h"
+ >
</File>
<File
- RelativePath="..\..\lib\CodeGen\VirtRegMap.h">
+ RelativePath="..\..\lib\CodeGen\VirtRegMap.h"
+ >
</File>
</Filter>
</Files>