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

Merge pull request #1624 from shoover/consolidate-mobile-targets 

Consolidate mobile targets
This commit is contained in:
ita1024 2015-09-09 23:00:05 +02:00
parent 8652c0b9da c376be6f61
commit b01ae4d98c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
waflib/Tools/msvc.py
View File

@ -283,12 +283,12 @@ def gather_wince_supported_platforms():
path,device = os.path.split(path)
if not device:
path,device = os.path.split(path)
platforms = []
for arch,compiler in all_wince_platforms:
platforms = []
if os.path.isdir(os.path.join(path, device, 'Lib', arch)):
platforms.append((arch, compiler, os.path.join(path, device, 'Include', arch), os.path.join(path, device, 'Lib', arch)))
if platforms:
supported_wince_platforms.append((device, platforms))
if platforms:
supported_wince_platforms.append((device, platforms))
return supported_wince_platforms
def gather_msvc_detected_versions():
@ -467,9 +467,14 @@ def gather_msvc_versions(conf, versions):
if wince_supported_platforms and os.path.isfile(vsvars):
conf.gather_wince_targets(versions, version, vc_path, vsvars, wince_supported_platforms)
# WP80 works with 11.0Exp and 11.0, both of which resolve to the same vc_path.
# Stop after one is found.
for version,vc_path in vc_paths:
vs_path = os.path.dirname(vc_path)
vsvars = os.path.join(vs_path, 'VC', 'WPSDK', 'WP80', 'vcvarsphoneall.bat')
if os.path.isfile(vsvars):
conf.gather_winphone_targets(versions, '8.0', vc_path, vsvars)
break
for version,vc_path in vc_paths:
vs_path = os.path.dirname(vc_path)