VStudio x64 build fixes. Looks like the x64 projects got out of date and this brings...

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

diff --git a/win32/Bitcode/Bitcode.vcproj b/win32/Bitcode/Bitcode.vcproj
index ebf5419a7d875a892b43cc15f3d299f015b47c77..c94822c9067f10ad7e60230e583f3466cf19e114 100644 (file)
--- a/win32/Bitcode/Bitcode.vcproj
+++ b/win32/Bitcode/Bitcode.vcproj
@@ -89,11 +89,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -110,17 +110,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_LIB;__STDC_LIMIT_MACROS;WIN32"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -156,11 +161,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -177,22 +182,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_LIB;__STDC_LIMIT_MACROS;WIN32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -253,6 +253,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"

diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 76302c0fd9c97e256d21ac9a689d8a8adbd73ad7..9ebd0c1679686aa2b9a775f977af13c9fa392001 100644 (file)
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -252,9 +252,9 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\hash_map"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;"
+                                               Description="Generating $(SolutionDir)llvm\ADT\hash_map.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>
@@ -276,9 +276,9 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\hash_set"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;"
+                                               Description="Generating $(SolutionDir)llvm\ADT\hash_set.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>
@@ -300,9 +300,9 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\iterator"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator&quot;"
+                                               Description="Generating $(SolutionDir)llvm\ADT\iterator.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>

diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index 051aef26ea22d42ca362a8c47918c7665e60b1f9..af785388f648453ac1754858177fbe0907bd8489 100644 (file)
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -90,11 +90,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -111,17 +111,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -157,11 +162,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -178,22 +183,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                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_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -254,6 +254,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
@@ -376,20 +377,6 @@
                        <File
                                RelativePath="..\..\lib\Support\SlowOperationInformer.cpp"
                                >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
                                <FileConfiguration
                                        Name="Release|x64"
                                        ExcludedFromBuild="true"

diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index c8e24f4672145afc1dbe80f83848aafaf9cf0cf8..33f8144e984df2c7e1368ea24a7f63df38ca6c65 100644 (file)
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -90,11 +90,10 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -111,24 +110,15 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                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"
-                               StringPooling="true"
-                               MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
-                               ForceConformanceInForLoopScope="true"
-                               RuntimeTypeInfo="true"
-                               UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
                                BrowseInformation="1"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
                                DisableSpecificWarnings="4355,4146,4800"
                        />
@@ -143,7 +133,6 @@
                        />
                        <Tool
                                Name="VCLibrarianTool"
-                               OutputFile="$(OutDir)/System.lib"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -183,17 +172,22 @@
                        />
                        <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"
@@ -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"

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index fabce04d1e48a628da8b452f5d89585202f1a8f8..5a5076862ecb105af44e9a3305ff20bfcb402966 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -105,11 +105,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -126,17 +126,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -154,13 +159,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\TableGen.exe"
-                               LinkIncremental="1"
+                               LinkIncremental="2"
                                AdditionalLibraryDirectories=""
                                GenerateDebugInformation="true"
+                               ProgramDatabaseFile="$(OutDir)/TableGen.pdb"
                                SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -188,11 +192,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -209,22 +213,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -242,12 +241,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\TableGen.exe"
-                               LinkIncremental="2"
+                               LinkIncremental="1"
                                AdditionalLibraryDirectories=""
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/TableGen.pdb"
                                SubSystem="1"
-                               TargetMachine="17"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -300,6 +300,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
                                StringPooling="true"
@@ -327,6 +328,7 @@
                                OutputFile="$(OutDir)\TableGen.exe"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories=""
+                               IgnoreAllDefaultLibraries="false"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 6ac8ab574d0e563a07269147424062dd62469f1b..9696927b95b6a8feb184d0342d7bdd0b0b340523 100644 (file)
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -90,11 +90,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -111,17 +111,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -157,11 +162,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -178,22 +183,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                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_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -372,24 +372,24 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|Win32"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
                                                CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\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"
+                                               AdditionalDependencies="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe;$(InputDir)IntrinsicsX86.td"
                                                Outputs="$(SolutionDir)llvm\intrinsics.gen"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="Release|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
-                                               CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen"
-                                               AdditionalDependencies="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
+                                               CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\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"
                                        />
                                </FileConfiguration>
@@ -399,8 +399,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
-                                               CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen"
-                                               AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
+                                               CommandLine="echo Building $(InputFileName) code emitter with tblgen&#x0D;&#x0A;$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen&#x0D;&#x0A;"
+                                               AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td"
                                                Outputs="$(SolutionDir)llvm\intrinsics.gen"
                                        />
                                </FileConfiguration>