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/ExecutionEngine/ExecutionEngine.vcproj b/win32/ExecutionEngine/ExecutionEngine.vcproj
index 26ee9df..bf98b49 100644
--- a/win32/ExecutionEngine/ExecutionEngine.vcproj
+++ b/win32/ExecutionEngine/ExecutionEngine.vcproj
@@ -1,104 +1,156 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="ExecutionEngine"
ProjectGUID="{76295AE8-A083-460E-9F80-6F2B8923264A}"
- 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)/ExecutionEngine.lib"/>
+ OutputFile="$(OutDir)/ExecutionEngine.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)/ExecutionEngine.lib"/>
+ OutputFile="$(OutDir)/ExecutionEngine.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,67 +159,85 @@
<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\ExecutionEngine\ExecutionEngine.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\ExecutionEngine.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\ExecutionEngine\ExecutionEngine.h">
+ RelativePath="..\..\include\llvm\ExecutionEngine\ExecutionEngine.h"
+ >
</File>
<File
- RelativePath="..\..\include\llvm\ExecutionEngine\GenericValue.h">
+ RelativePath="..\..\include\llvm\ExecutionEngine\GenericValue.h"
+ >
</File>
</Filter>
<Filter
Name="JIT"
- Filter="">
+ >
<File
- RelativePath="..\..\lib\ExecutionEngine\Jit\Intercept.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Jit\Intercept.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Jit\JIT.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Jit\JIT.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Jit\JIT.h">
+ RelativePath="..\..\lib\ExecutionEngine\Jit\JIT.h"
+ >
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Jit\JITEmitter.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Jit\JITEmitter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Jit\TargetSelect.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Jit\TargetSelect.cpp"
+ >
</File>
</Filter>
<Filter
Name="Interpreter"
- Filter="">
+ >
<File
- RelativePath="..\..\lib\ExecutionEngine\Interpreter\Execution.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Interpreter\Execution.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Interpreter\ExternalFunctions.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Interpreter\ExternalFunctions.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- DisableSpecificWarnings="4190"/>
+ DisableSpecificWarnings="4190"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- DisableSpecificWarnings="4190"/>
+ DisableSpecificWarnings="4190"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Interpreter\Interpreter.cpp">
+ RelativePath="..\..\lib\ExecutionEngine\Interpreter\Interpreter.cpp"
+ >
</File>
<File
- RelativePath="..\..\lib\ExecutionEngine\Interpreter\Interpreter.h">
+ RelativePath="..\..\lib\ExecutionEngine\Interpreter\Interpreter.h"
+ >
</File>
</Filter>
</Files>