Add PR to this FIXME, looks like I didn't commit this change after all.

[oota-llvm.git] / win32 / System / System.vcproj

diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 56862d1dc86f410bc557c8f3fc063fa85d7f3ebd..f72a754a3cded23e821cf10e9c897b3119803c7c 100644 (file)
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -11,16 +11,19 @@
                <Platform
                        Name="Win32"
                />
+               <Platform
+                       Name="x64"
+               />
        </Platforms>
        <ToolFiles>
        </ToolFiles>
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="..\Debug"
-                       IntermediateDirectory="Debug"
+                       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
@@ -86,10 +89,143 @@
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\include;.."
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4355,4146,4800"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="..\Release"
-                       IntermediateDirectory="Release"
+                       OutputDirectory="$(ProjectDir)..\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_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               StringPooling="true"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="2"
+                               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)/System.lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
@@ -108,9 +244,11 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
@@ -119,6 +257,7 @@
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -175,11 +314,11 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\System\IncludeFile.cpp"
+                               RelativePath="..\..\lib\System\Host.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\System\MappedFile.cpp"
+                               RelativePath="..\..\lib\System\IncludeFile.cpp"
                                >
                        </File>
                        <File
@@ -228,6 +367,10 @@
                                RelativePath="..\..\include\llvm\System\DynamicLibrary.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\System\Host.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\System\IncludeFile.h"
                                >