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 68130a6aebaf714c484151846b9d06d658045e99..f72a754a3cded23e821cf10e9c897b3119803c7c 100644 (file)
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -20,10 +20,10 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       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
@@ -90,11 +90,10 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       Name="Debug|x64"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -114,16 +113,12 @@
                        />
                        <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"
-                               RuntimeLibrary="2"
-                               ForceConformanceInForLoopScope="true"
-                               RuntimeTypeInfo="true"
-                               UsePrecompiledHeader="0"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
+                               BrowseInformation="1"
                                DebugInformationFormat="3"
                                DisableSpecificWarnings="4355,4146,4800"
                        />
@@ -138,7 +133,6 @@
                        />
                        <Tool
                                Name="VCLibrarianTool"
-                               OutputFile="$(OutDir)/System.lib"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -157,8 +151,8 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       Name="Release|Win32"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -184,11 +178,11 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               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_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
@@ -230,7 +224,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -254,6 +248,7 @@
                        />
                        <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"
@@ -262,6 +257,7 @@
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -318,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
@@ -371,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"
                                >