commit 2616a7e0f79afb18d53fff4dcde98f942feb30ae
author Chris Lattner <sabre@nondot.org> Fri Jun 20 05:35:58 2008 +0000
committer Chris Lattner <sabre@nondot.org> Fri Jun 20 05:35:58 2008 +0000
tree 9c339fbed8e1b27c4968f54b96e158488befc2d7
parent 54d26c6b12d1d84026d7a1d1d0d8ad69e0956367

"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!

llvm-svn: 52530

llvm/win32/llvm-link/llvm-link.vcproj

diff --git a/llvm/win32/llvm-link/llvm-link.vcproj b/llvm/win32/llvm-link/llvm-link.vcproj
index 18116b4..65b01d6 100644
--- a/llvm/win32/llvm-link/llvm-link.vcproj
+++ b/llvm/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