diff options
Diffstat (limited to '3rdParty/SCons/scons-local/SCons/Tool/mslib.py')
-rw-r--r-- | 3rdParty/SCons/scons-local/SCons/Tool/mslib.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/Tool/mslib.py b/3rdParty/SCons/scons-local/SCons/Tool/mslib.py index f76ac9d..26a54b9 100644 --- a/3rdParty/SCons/scons-local/SCons/Tool/mslib.py +++ b/3rdParty/SCons/scons-local/SCons/Tool/mslib.py @@ -9,7 +9,7 @@ selection method. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/mslib.py 4043 2009/02/23 09:06:45 scons" +__revision__ = "src/engine/SCons/Tool/mslib.py 4761 2010/04/04 14:04:44 bdeegan" import SCons.Defaults import SCons.Tool @@ -39,14 +39,14 @@ import SCons.Tool.msvs import SCons.Tool.msvc import SCons.Util -from MSCommon import detect_msvs, merge_default_version +from MSCommon import msvc_exists, msvc_setup_env_once def generate(env): """Add Builders and construction variables for lib to an Environment.""" SCons.Tool.createStaticLibBuilder(env) - # Set-up ms tools paths for default version - merge_default_version(env) + # Set-up ms tools paths + msvc_setup_env_once(env) env['AR'] = 'lib' env['ARFLAGS'] = SCons.Util.CLVar('/nologo') @@ -55,7 +55,7 @@ def generate(env): env['LIBSUFFIX'] = '.lib' def exists(env): - return detect_msvs() + return msvc_exists() # Local Variables: # tab-width:4 |