Windows: Add ARM64 binary distribution support (see issue #2773)

This commit is contained in:
Iain Apreotesei
2020-02-19 16:33:27 +00:00
committed by Marshall Greenblatt
parent 294eb75355
commit afcee77abe
5 changed files with 21 additions and 10 deletions

View File

@@ -556,8 +556,12 @@ if options.x64build + options.armbuild + options.arm64build > 1:
print_error('Invalid combination of build options.')
sys.exit()
if (options.armbuild or options.arm64build) and platform != 'linux':
print_error('--arm-build and --arm64-build are only supported on Linux.')
if options.armbuild and platform != 'linux':
print_error('--arm-build is only supported on Linux.')
sys.exit()
if options.arm64build and not platform in ('linux', 'windows'):
print_error('--arm64-build is only supported on Linux and Windows.')
sys.exit()
if options.sandbox and not platform in ('macosx', 'windows'):

View File

@@ -13,11 +13,13 @@ setlocal enabledelayedexpansion
:: Require that platform is passed as the first argument.
if "%1" == "win32" (
set bits=32
set vcvarsbat=vcvars32.bat
) else if "%1" == "win64" (
set bits=64
set vcvarsbat=vcvars64.bat
) else if "%1" == "winarm64" (
set vcvarsbat=vcvarsamd64_arm64.bat
) else (
echo ERROR: Please specify a target platform: win32 or win64
echo ERROR: Please specify a target platform: win32, win64 or winarm64
set ERRORLEVEL=1
goto end
)
@@ -30,7 +32,7 @@ if exist %vcvars% goto found_vcvars
:: Search for the default VS2017 installation path.
for %%x in ("%PROGRAMFILES(X86)%" "%PROGRAMFILES%") do (
for %%y in (Professional Enterprise Community BuildTools) do (
set vcvars="%%~x\Microsoft Visual Studio\2017\%%y\VC\Auxiliary\Build\vcvars%bits%.bat"
set vcvars="%%~x\Microsoft Visual Studio\2017\%%y\VC\Auxiliary\Build\%vcvarsbat%"
if exist !vcvars! goto found_vcvars
)
)