"Just a small update for the project files for adding a missing preprocessor

definition for VS2005 (without SP1). It suppress the (bogus) M$ deprecated
warning."

Patch by Cédric Venet!

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

diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 923edb4b718d7336243ff53538dcce7404c57f5a..fb40d9ffb1e08db3782cd04c55652a70759b0842 100644 (file)
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/Archive/Archive.vcproj b/win32/Archive/Archive.vcproj
index eba647a53b40cfa049e1a23c07247ab60cc9c8e2..be8035d218d4c1c60f250efc794057c6b5047553 100644 (file)
--- a/win32/Archive/Archive.vcproj
+++ b/win32/Archive/Archive.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/AsmParser/AsmParser.vcproj b/win32/AsmParser/AsmParser.vcproj
index ac0aae6777730358938c2598b9bf6990288dbd2f..2b7cb40ed3fdc5c57cc11380a2d8fb0254d66031 100644 (file)
--- a/win32/AsmParser/AsmParser.vcproj
+++ b/win32/AsmParser/AsmParser.vcproj
@@ -23,7 +23,7 @@
                        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
@@ -94,7 +94,7 @@
                        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

diff --git a/win32/Bitcode/Bitcode.vcproj b/win32/Bitcode/Bitcode.vcproj
index 7bcdfbb7bfb49da9b8d5a2e7b1134c4ae28e4115..ebf5419a7d875a892b43cc15f3d299f015b47c77 100644 (file)
--- a/win32/Bitcode/Bitcode.vcproj
+++ b/win32/Bitcode/Bitcode.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/CBackend/CBackend.vcproj b/win32/CBackend/CBackend.vcproj
index ce2ef3e6612c2bfdb4c7dc47b882fe63e072ea59..7a74b46736d18b9abbd2f68634a41f061818b260 100644 (file)
--- a/win32/CBackend/CBackend.vcproj
+++ b/win32/CBackend/CBackend.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index bec007e5767fd60a85e5fb8e000a879fab1066c5..551fb2c0cc078ae0d91654f617c3f29d88c3ebbc 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 475c749deb79ccfb0480b8c68fedd5f69901d6b7..76302c0fd9c97e256d21ac9a689d8a8adbd73ad7 100644 (file)
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -23,7 +23,7 @@
                        OutputDirectory="$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -291,7 +291,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating $(SolutionDir)llvm\ADT\iterator.h"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;&#x0D;&#x0A;"
                                                Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;"
                                        />
                                </FileConfiguration>

diff --git a/win32/ExecutionEngine/ExecutionEngine.vcproj b/win32/ExecutionEngine/ExecutionEngine.vcproj
index ee2a1d31e3877f718e8c24207fa6185f238dcb3c..0418fddd139df70a7b9d9156f9c14ca08de969ea 100644 (file)
--- a/win32/ExecutionEngine/ExecutionEngine.vcproj
+++ b/win32/ExecutionEngine/ExecutionEngine.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/Fibonacci/Fibonacci.vcproj b/win32/Fibonacci/Fibonacci.vcproj
index 3144a73794099b423d212d9cbde2e903b9298121..3c0dfb04c2ba120be6b43007f1aee2477dae4c60 100644 (file)
--- a/win32/Fibonacci/Fibonacci.vcproj
+++ b/win32/Fibonacci/Fibonacci.vcproj
@@ -23,7 +23,7 @@
                        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
@@ -110,7 +110,7 @@
                        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

diff --git a/win32/Linker/Linker.vcproj b/win32/Linker/Linker.vcproj
index 7b720f9f902f4e58eb9566882bbb458b21918551..36bb28edb0b37a9c60949f8b0a0d6a519b68aaa4 100644 (file)
--- a/win32/Linker/Linker.vcproj
+++ b/win32/Linker/Linker.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index c6bca2e59fdf6b7ed2c35f834cc801ce585572d0..b85cf8dddaecb6b46eb54a02ab1dcb1d3630caee 100644 (file)
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -23,7 +23,7 @@
                        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
@@ -94,7 +94,7 @@
                        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

diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index c450e93c2198e3228dbe61c2f68e16e53e20e760..c8e24f4672145afc1dbe80f83848aafaf9cf0cf8 100644 (file)
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -23,7 +23,7 @@
                        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
@@ -90,11 +90,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

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index f64f1956d555311e985ce4cff0e1e02474357cf2..fabce04d1e48a628da8b452f5d89585202f1a8f8 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -23,7 +23,7 @@
                        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
@@ -109,7 +109,7 @@
                        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

diff --git a/win32/Target/Target.vcproj b/win32/Target/Target.vcproj
index e64089e4acbf7f26cdcac3b4c56f79120d60cc00..0a388051446e7b50aa9b7503a8665185c53192d2 100644 (file)
--- a/win32/Target/Target.vcproj
+++ b/win32/Target/Target.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index a2347b0381a287554bfd45be1b5e452aa7b0215c..f94e18e5e8a8401a1dbaf733ae85d748e83e9f25 100644 (file)
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -93,7 +93,7 @@
                        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

diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index e88cb79d8499d5b2187d79ca5a5db56fb3add788..6ac8ab574d0e563a07269147424062dd62469f1b 100644 (file)
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -23,7 +23,7 @@
                        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
@@ -94,7 +94,7 @@
                        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

diff --git a/win32/bugpoint/bugpoint.vcproj b/win32/bugpoint/bugpoint.vcproj
index c124b557c6c8e9a203ffaa7167b9e23c7a2b8100..cd430b53da8dfd2d528c688b20e47fda9022c5ab 100644 (file)
--- a/win32/bugpoint/bugpoint.vcproj
+++ b/win32/bugpoint/bugpoint.vcproj
@@ -22,7 +22,7 @@
                        OutputDirectory="$(SolutionDir)\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -107,7 +107,7 @@
                        OutputDirectory="$(SolutionDir)\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool

diff --git a/win32/llc/llc.vcproj b/win32/llc/llc.vcproj
index 68edf911001ce5dcc78ec0410bec55545e814355..f295e62742f8fbc160adc777b4a6bb8100e02dfe 100644 (file)
--- a/win32/llc/llc.vcproj
+++ b/win32/llc/llc.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -108,7 +108,7 @@
                        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

diff --git a/win32/lli/lli.vcproj b/win32/lli/lli.vcproj
index 79e99df49054c90b4504a9535a3e972f91aad4c9..1d3571e28c50dcaebaca6204c4bcdbe42a12a90f 100644 (file)
--- a/win32/lli/lli.vcproj
+++ b/win32/lli/lli.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -108,7 +108,7 @@
                        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

diff --git a/win32/llvm-ar/llvm-ar.vcproj b/win32/llvm-ar/llvm-ar.vcproj
index 0cdfebbafb37d9522a479d6a3ad8af6af9508439..811f6b103ead6dea374839089432fe91761d076b 100644 (file)
--- a/win32/llvm-ar/llvm-ar.vcproj
+++ b/win32/llvm-ar/llvm-ar.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-as/llvm-as.vcproj b/win32/llvm-as/llvm-as.vcproj
index 91048700aef1a39aefe7bdc49cc3cb395531603b..c84884bf4564d655e32a4fd13acf26733f6f01b4 100644 (file)
--- a/win32/llvm-as/llvm-as.vcproj
+++ b/win32/llvm-as/llvm-as.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj b/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj
index db4e481542cc325bfda92c805f5dd7108ea4ffc4..b2c8c4d89afb7d0941645019d62e661ecfd3d374 100644 (file)
--- a/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj
+++ b/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-dis/llvm-dis.vcproj b/win32/llvm-dis/llvm-dis.vcproj
index b2d56d3a2cc1c2c799a10a1c6148df4f641d02f6..240baea8f89055d7ca11f9b2d123eb7629729be6 100644 (file)
--- a/win32/llvm-dis/llvm-dis.vcproj
+++ b/win32/llvm-dis/llvm-dis.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-ld/llvm-ld.vcproj b/win32/llvm-ld/llvm-ld.vcproj
index 4e25bd238ec7593b924f8dada24d9a36c0e9f943..d3141f18bb6c4544c5d1c977ca4f75d75e3df9d0 100644 (file)
--- a/win32/llvm-ld/llvm-ld.vcproj
+++ b/win32/llvm-ld/llvm-ld.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-link/llvm-link.vcproj b/win32/llvm-link/llvm-link.vcproj
index 18116b469cbfe6837905174f3d9e9e3295cceedc..65b01d6d801f0e69b071e26461c13efb6d463570 100644 (file)
--- a/win32/llvm-link/llvm-link.vcproj
+++ b/win32/llvm-link/llvm-link.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-nm/llvm-nm.vcproj b/win32/llvm-nm/llvm-nm.vcproj
index d353b22afdbd9df5b4872a80fd3e37ea2ab05440..c6cb5e55b8e57fd453388ec087b0eb177d49edbe 100644 (file)
--- a/win32/llvm-nm/llvm-nm.vcproj
+++ b/win32/llvm-nm/llvm-nm.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-prof/llvm-prof.vcproj b/win32/llvm-prof/llvm-prof.vcproj
index db33ccb50e02634b5448e5b82eeee4b2a4d62575..c3b6f9caabefd2189516dfd292fb8e94e66b1d8d 100644 (file)
--- a/win32/llvm-prof/llvm-prof.vcproj
+++ b/win32/llvm-prof/llvm-prof.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/llvm-ranlib/llvm-ranlib.vcproj b/win32/llvm-ranlib/llvm-ranlib.vcproj
index 0a1db0efdb3357835c06a05d48d3fa3302dfcb2b..9e66ae4fa002fcf5bde63e0ff4dace38497236d1 100644 (file)
--- a/win32/llvm-ranlib/llvm-ranlib.vcproj
+++ b/win32/llvm-ranlib/llvm-ranlib.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/opt/opt.vcproj b/win32/opt/opt.vcproj
index 17b749c3692e317c9ae657dfca1e71442c1c886f..c341e74262c39a8c98e74df21986603e51741f62 100644 (file)
--- a/win32/opt/opt.vcproj
+++ b/win32/opt/opt.vcproj
@@ -22,7 +22,7 @@
                        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
@@ -107,7 +107,7 @@
                        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

diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index b47d559433432ae248a8e9edb98ad49a1c540c08..2228ea85c5cde9404ea30818e61d2e1d34deb491 100644 (file)
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -23,7 +23,7 @@
                        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