diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2011-05-17 01:43:07 +0000 |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2011-05-17 01:43:07 +0000 |
| commit | 4b93c221aca42bb0e34011b44da7d4663a305d9b (patch) | |
| tree | 3fcaedf546cac151be66f87d59d0590e4f23c74e | |
| parent | c7fc4225bcf9c73c5a37cf07cfb79bbc50261ff1 (diff) | |
| download | scons-4b93c221aca42bb0e34011b44da7d4663a305d9b.tar.gz | |
msvs: prev commit missed VS10 case. Fixed here.
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 5414ada3..6c273a7d 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1015,8 +1015,12 @@ class _GenerateV10DSP(_DSPGenerator): rebuildcmd = xmlify(starting + self.env.subst('$MSVSREBUILDCOM', 1) + cmdargs) cleancmd = xmlify(starting + self.env.subst('$MSVSCLEANCOM', 1) + cmdargs) + # This isn't perfect; CPPDEFINES and CPPPATH can contain $TARGET and $SOURCE, + # so they could vary depending on the command being generated. This code + # assumes they don't. preprocdefs = xmlify(';'.join(processDefines(self.env.get('CPPDEFINES', [])))) - includepath = xmlify(';'.join(self.env.get('CPPPATH', []))) + includepath_Dirs = processIncludes(self.env.get('CPPPATH', []), self.env, None, None) + includepath = xmlify(';'.join([str(x) for x in includepath_Dirs])) if not env_has_buildtarget: del self.env['MSVSBUILDTARGET'] |