FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update vs2017 support to correctly configure x64

This commit is contained in:
Gordon Tisher 2017-03-15 10:03:35 -07:00 committed by Thomas Nagy
parent 7c44ac1b3b
commit dfba301324
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
waflib/Tools/msvc.py
View File

@ -384,9 +384,13 @@ class target_compiler(object):
def gather_msvc_targets(conf, versions, version, vc_path):
#Looking for normal MSVC compilers!
targets = {}
if os.path.isfile(os.path.join(vc_path, 'Common7', 'Tools', 'VsDevCmd.bat')):
for target,realtarget in all_msvc_platforms[::-1]:
targets[target] = target_compiler(conf, 'msvc', realtarget, version, target, os.path.join(vc_path, 'Common7', 'Tools', 'VsDevCmd.bat'))
vs2017_x86 = os.path.join(vc_path, 'VC', 'Auxiliary', 'Build', 'vcvars32.bat')
if os.path.isfile(vs2017_x86):
targets['x86'] = target_compiler(conf, 'msvc', 'x86', version, 'x86', vs2017_x86)
vs2017_x64 = os.path.join(vc_path, 'VC', 'Auxiliary', 'Build', 'vcvars64.bat')
if os.path.isfile(vs2017_x64):
targets['x64'] = target_compiler(conf, 'msvc', 'x64', version, 'x64', vs2017_x64)
elif os.path.isfile(os.path.join(vc_path, 'vcvarsall.bat')):
for target,realtarget in all_msvc_platforms[::-1]:
targets[target] = target_compiler(conf, 'msvc', realtarget, version, target, os.path.join(vc_path, 'vcvarsall.bat'))