summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-08-12 14:16:30 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-08-12 14:16:30 (GMT)
commitf6ec68e2eb534bf8fff6f470b7e8facdde045b63 (patch)
treef562b55a84104cc810c29f40fd17a7c68b03f187 /src/engine/SCons
parent18ed9b715d052ad972940e90e9d83da53216c289 (diff)
parent83e76a293df54101826975c78bbffbe5e8018304 (diff)
downloadSCons-f6ec68e2eb534bf8fff6f470b7e8facdde045b63.zip
SCons-f6ec68e2eb534bf8fff6f470b7e8facdde045b63.tar.gz
SCons-f6ec68e2eb534bf8fff6f470b7e8facdde045b63.tar.bz2
Merged in mlimber/scons (pull request #350)
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Tool/msvs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 6df4928..6e91909 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1844,7 +1844,10 @@ def projectEmitter(target, source, env):
targetlist = targetlist + t
# Beginning with Visual Studio 2010 for each project file (.vcxproj) we have additional file (.vcxproj.filters)
- if float(env['MSVS_VERSION']) >= 10.0:
+ version_num = 6.0
+ if 'MSVS_VERSION' in env:
+ version_num, suite = msvs_parse_version(env['MSVS_VERSION'])
+ if version_num >= 10.0:
targetlist.append(targetlist[0] + '.filters')
return (targetlist, sourcelist)