summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2009-02-22 08:17:49 (GMT)
committerSteven Knight <knight@baldmt.com>2009-02-22 08:17:49 (GMT)
commit9be901392ae6a13ebe2590e1d1c61adf4f0d7172 (patch)
tree964056a467170f6a9064b72a6a58f9cdc5e79556 /src
parent140cb569328ee9904e7339932502307d035a8ee0 (diff)
downloadSCons-9be901392ae6a13ebe2590e1d1c61adf4f0d7172.zip
SCons-9be901392ae6a13ebe2590e1d1c61adf4f0d7172.tar.gz
SCons-9be901392ae6a13ebe2590e1d1c61adf4f0d7172.tar.bz2
Set IncludeSearchPath and PreprocessorDefinitions in the generation
project files for Visual Studio 8.0. (Allan Erskine)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt5
-rw-r--r--src/engine/SCons/Tool/msvs.py7
2 files changed, 10 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index cb7fe8c..de5cce8 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -27,6 +27,11 @@ RELEASE X.X.X - XXX
- Fix generation of Visual Studio 8 project files on x64 platforms.
+ From Allan Erskine:
+
+ - Set IncludeSearchPath and PreprocessorDefinitions in generated
+ Visual Studio 8 project files, to help IntelliSense work.
+
From Steven Knight:
- Fix the error message when use of a non-existent drive on Windows
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 4d40d8c..e0f31dd 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -595,8 +595,8 @@ V8DSPConfiguration = """\
\t\t\t\tReBuildCommandLine="%(rebuildcmd)s"
\t\t\t\tCleanCommandLine="%(cleancmd)s"
\t\t\t\tOutput="%(runfile)s"
-\t\t\t\tPreprocessorDefinitions=""
-\t\t\t\tIncludeSearchPath=""
+\t\t\t\tPreprocessorDefinitions="%(preprocdefs)s"
+\t\t\t\tIncludeSearchPath="%(includepath)s"
\t\t\t\tForcedIncludes=""
\t\t\t\tAssemblySearchPath=""
\t\t\t\tForcedUsingAssemblies=""
@@ -686,6 +686,9 @@ class _GenerateV7DSP(_DSPGenerator):
rebuildcmd = xmlify(starting + self.env.subst('$MSVSREBUILDCOM', 1) + cmdargs)
cleancmd = xmlify(starting + self.env.subst('$MSVSCLEANCOM', 1) + cmdargs)
+ preprocdefs = xmlify(';'.join(self.env.get('CPPDEFINES', [])))
+ includepath = xmlify(';'.join(self.env.get('CPPPATH', [])))
+
if not env_has_buildtarget:
del self.env['MSVSBUILDTARGET']