RandomHuman/Mypal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for the Windows 10 SDK.

Browse Source
This commit is contained in:
Fedor 2019-09-20 13:10:02 +03:00
parent 56821f05f2
commit 94c6e51ff3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/moz.configure/windows.configure
View File

@ -361,10 +361,10 @@ set_config('LIB', lib_path)
option(env='MT', nargs=1, help='Path to the Microsoft Manifest Tool') option(env='MT', nargs=1, help='Path to the Microsoft Manifest Tool')
@depends_win(valid_windows_sdk_dir) @depends_win(valid_windows_sdk_dir, valid_ucrt_sdk_dir)
@imports(_from='os', _import='environ') @imports(_from='os', _import='environ')
@imports('platform') @imports('platform')
def sdk_bin_path(valid_windows_sdk_dir): def sdk_bin_path(valid_windows_sdk_dir, valid_ucrt_sdk_dir):
if not valid_windows_sdk_dir: if not valid_windows_sdk_dir:
return return
@ -373,13 +373,17 @@ def sdk_bin_path(valid_windows_sdk_dir):
'AMD64': 'x64', 'AMD64': 'x64',
}.get(platform.machine()) }.get(platform.machine())
# From version 10.0.15063.0 onwards the bin path contains the version number.
versioned_bin = ('bin' if valid_ucrt_sdk_dir.version < '10.0.15063.0'
else os.path.join('bin', str(valid_ucrt_sdk_dir.version)))
result = [ result = [
environ['PATH'], environ['PATH'],
os.path.join(valid_windows_sdk_dir.path, 'bin', vc_host) os.path.join(valid_windows_sdk_dir.path, versioned_bin, vc_host)
] ]
if vc_host == 'x64': if vc_host == 'x64':
result.append( result.append(
os.path.join(valid_windows_sdk_dir.path, 'bin', 'x86')) os.path.join(valid_windows_sdk_dir.path, versioned_bin, 'x86'))
return result return result