diff options
Diffstat (limited to 'SCons')
| -rw-r--r-- | SCons/Tool/MSCommon/common.py | 4 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/vc.py | 4 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/vs.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py index 83bd2fd..fcf9fa7 100644 --- a/SCons/Tool/MSCommon/common.py +++ b/SCons/Tool/MSCommon/common.py @@ -253,8 +253,8 @@ def get_output(vcbat, args=None, env=None): 'VS90COMNTOOLS', 'VS80COMNTOOLS', 'VS71COMNTOOLS', - 'VS70COMNTOOLS', - 'VS60COMNTOOLS', + 'VSCOMNTOOLS', + 'MSDevDir', 'VSCMD_DEBUG', # enable logging and other debug aids 'VSCMD_SKIP_SENDTELEMETRY', ] diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py index 7789bca..75777e2 100644 --- a/SCons/Tool/MSCommon/vc.py +++ b/SCons/Tool/MSCommon/vc.py @@ -779,8 +779,8 @@ def find_batch_file(env, msvc_version, host_arch, target_arch): batfilename = os.path.join(pdir, "vcvarsall.bat") elif 8 > vernum >= 7: # 7.1 (VS2003) to 7.0 (VS2003) - pdir = os.path.join(pdir, os.pardir, "Common7", "Tools") - batfilename = os.path.join(pdir, "vsvars32.bat") + pdir = os.path.join(pdir, "Bin") + batfilename = os.path.join(pdir, "vcvars32.bat") else: # 6.0 (VS6) and earlier pdir = os.path.join(pdir, "Bin") diff --git a/SCons/Tool/MSCommon/vs.py b/SCons/Tool/MSCommon/vs.py index 35d21e0..08c3cf5 100644 --- a/SCons/Tool/MSCommon/vs.py +++ b/SCons/Tool/MSCommon/vs.py @@ -391,7 +391,7 @@ SupportedVSList = [ VisualStudio('7.0', sdk_version='2003R2', hkeys=[r'Microsoft\VisualStudio\7.0\Setup\VS\ProductDir'], - common_tools_var='VS70COMNTOOLS', + common_tools_var='VSCOMNTOOLS', executable_path=r'Common7\IDE\devenv.com', batch_file_path=r'Common7\Tools\vsvars32.bat', default_dirname='Microsoft Visual Studio .NET', @@ -403,7 +403,7 @@ SupportedVSList = [ sdk_version='2003R1', hkeys=[r'Microsoft\VisualStudio\6.0\Setup\Microsoft Visual Studio\ProductDir', 'use_dir'], - common_tools_var='VS60COMNTOOLS', + common_tools_var='MSDevDir', executable_path=r'Common\MSDev98\Bin\MSDEV.COM', batch_file_path=r'Common7\Tools\vsvars32.bat', default_dirname='Microsoft Visual Studio', |