diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-11-19 05:03:36 (GMT) |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-11-19 05:03:36 (GMT) |
| commit | 88dc7119c4ef49b3b2acee7f650d333a32ca4b2d (patch) | |
| tree | e88636152822f25cca82e30a8804310d168600f7 /src/engine/SCons/Tool/msvs.py | |
| parent | 4e972790d389101d871f584feb3ab11b9534f9c9 (diff) | |
| download | SCons-88dc7119c4ef49b3b2acee7f650d333a32ca4b2d.zip SCons-88dc7119c4ef49b3b2acee7f650d333a32ca4b2d.tar.gz SCons-88dc7119c4ef49b3b2acee7f650d333a32ca4b2d.tar.bz2 | |
ENH: use msvc_exists for all tools in the Visual Studio toolchain.
Diffstat (limited to 'src/engine/SCons/Tool/msvs.py')
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index b0893da..89bd985 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -49,7 +49,7 @@ import SCons.Script.SConscript import SCons.Util import SCons.Warnings -from MSCommon import msvs_exists, merge_default_version +from MSCommon import msvc_exists, msvc_setup_env_once from SCons.Defaults import processDefines ############################################################################## @@ -1408,7 +1408,7 @@ def generate(env): env['MSVSENCODING'] = 'Windows-1252' # Set-up ms tools paths for default version - merge_default_version(env) + msvc_setup_env_once(env) version_num, suite = msvs_parse_version(env['MSVS_VERSION']) if (version_num < 7.0): @@ -1425,7 +1425,7 @@ def generate(env): env['SCONS_HOME'] = os.environ.get('SCONS_HOME') def exists(env): - return msvs_exists() + return msvc_exists() # Local Variables: # tab-width:4 |