summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Tool/msvs.py
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2009-11-25 03:27:20 +0000
committerGary Oberbrunner <garyo@oberbrunner.com>2009-11-25 03:27:20 +0000
commit099c8e45507835838d7449ec258283119d9fefb3 (patch)
tree0d67e004cd572053846ca310c7835878dfffdfe6 /src/engine/SCons/Tool/msvs.py
parent8b2c2318104c3d9a9627bf90da75550941bf5eea (diff)
downloadscons-099c8e45507835838d7449ec258283119d9fefb3.tar.gz
A couple more test fixes, to make test/import.py work on Linux.
Diffstat (limited to 'src/engine/SCons/Tool/msvs.py')
-rw-r--r--src/engine/SCons/Tool/msvs.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 89bd985e..f43dd945 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1410,7 +1410,12 @@ def generate(env):
# Set-up ms tools paths for default version
msvc_setup_env_once(env)
- version_num, suite = msvs_parse_version(env['MSVS_VERSION'])
+ if env.has_key('MSVS_VERSION'):
+ version_num, suite = msvs_parse_version(env['MSVS_VERSION'])
+ else:
+ (version_num, suite) = (7.0, None) # guess at a default
+ if not env.has_key('MSVS'):
+ env['MSVS'] = {}
if (version_num < 7.0):
env['MSVS']['PROJECTSUFFIX'] = '.dsp'
env['MSVS']['SOLUTIONSUFFIX'] = '.dsw'