aboutsummaryrefslogtreecommitdiffstats
path: root/win32/llvm-ld/llvm-ld.vcproj
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-06-20 05:35:58 +0000
committerChris Lattner <sabre@nondot.org>2008-06-20 05:35:58 +0000
commitf6af087cb93d949d333977246cc34353589260df (patch)
tree7fbe071aa3691854962f75e973f756725c15ee35 /win32/llvm-ld/llvm-ld.vcproj
parenta3de6e9ab8fbd4c9462880dc5c138488b322efd0 (diff)
downloadexternal_llvm-f6af087cb93d949d333977246cc34353589260df.zip
external_llvm-f6af087cb93d949d333977246cc34353589260df.tar.gz
external_llvm-f6af087cb93d949d333977246cc34353589260df.tar.bz2
"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
Diffstat (limited to 'win32/llvm-ld/llvm-ld.vcproj')
-rw-r--r--win32/llvm-ld/llvm-ld.vcproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/llvm-ld/llvm-ld.vcproj b/win32/llvm-ld/llvm-ld.vcproj
index 4e25bd2..d3141f1 100644
--- 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