Swiftdiff options
Diffstat (limited to '3rdParty/SCons/scons-local/SCons/Tool/mssdk.py')
| -rw-r--r-- | 3rdParty/SCons/scons-local/SCons/Tool/mssdk.py | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/Tool/mssdk.py b/3rdParty/SCons/scons-local/SCons/Tool/mssdk.py index 4277d58..9402e0e 100644 --- a/3rdParty/SCons/scons-local/SCons/Tool/mssdk.py +++ b/3rdParty/SCons/scons-local/SCons/Tool/mssdk.py @@ -1,5 +1,5 @@ # -# 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 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/mssdk.py 4043 2009/02/23 09:06:45 scons" +__revision__ = "src/engine/SCons/Tool/mssdk.py 4761 2010/04/04 14:04:44 bdeegan" """engine.SCons.Tool.mssdk @@ -33,29 +33,15 @@ It will usually be imported through the generic SCons.Tool.Tool() selection method. """ -from SCons.Tool.MSCommon.sdk import detect_sdk, \ - set_default_sdk, \ - set_sdk_by_directory, \ - set_sdk_by_version +from MSCommon import mssdk_exists, \ + mssdk_setup_env def generate(env): """Add construction variables for an MS SDK to an Environment.""" - if env.has_key('MSSDK_DIR'): - set_sdk_by_directory(env, env.subst('$MSSDK_DIR')) - return - - if env.has_key('MSSDK_VERSION'): - set_sdk_by_version(env, env.subst('$MSSDK_VERSION')) - return - - if env.has_key('MSVS_VERSION'): - set_default_sdk(env, env['MSVS_VERSION']) - - #print "No MSVS_VERSION: this is likely to be a bug" - return + mssdk_setup_env(env) def exists(env): - return detect_sdk() + return mssdk_exists() # Local Variables: # tab-width:4 |