Windows/ARM64: Add MSVC cross-build support for x64 to ARM64.

Thanks to invertego. #1081

diff --git a/doc/install.html b/doc/install.html
index 2c685c85ace1f9081a52b7a43e4791a77cbf6fd8..04bfe26d12f30c8e4a302fb34667ffce7e88aa96 100644 (file)
--- a/doc/install.html
+++ b/doc/install.html
@@ -214,6 +214,9 @@ msvcbuild
 Check the <tt>msvcbuild.bat</tt> file for more options.
 Then follow the installation instructions below.
 </p>
+<p>
+For an x64 to ARM64 cross-build run this first: <tt>vcvarsall.bat x64_arm64</tt>
+</p>
 <h3>Building with MinGW or Cygwin</h3>
 <p>
 Open a command prompt window and make sure the MinGW or Cygwin programs

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 2cfcf26e7f95c0736ddbcd933fc11c5212280d7b..cd25beee1f98bfa57c9051f268893c49cfd88d79 100644 (file)
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -27,12 +27,15 @@
 @set BUILDTYPE=release\r
 @set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c\r
 \r
+@setlocal\r
+@call :SETHOSTVARS\r
 %LJCOMPILE% host\minilua.c\r
 @if errorlevel 1 goto :BAD\r
 %LJLINK% /out:minilua.exe minilua.obj\r
 @if errorlevel 1 goto :BAD\r
 if exist minilua.exe.manifest^\r
   %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe\r
+@endlocal\r
 \r
 @set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU -D P64\r
 @set LJARCH=x64\r
@@ -46,6 +49,7 @@ if exist minilua.exe.manifest^
 :NO32\r
 @if "%VSCMD_ARG_TGT_ARCH%" neq "arm64" goto :X64\r
 @set DASC=vm_arm64.dasc\r
+@set DASMTARGET=-D LUAJIT_TARGET=LUAJIT_ARCH_ARM64\r
 @set LJARCH=arm64\r
 @goto :DA\r
 :X64\r
@@ -60,12 +64,15 @@ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
 if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )\r
 minilua host\genversion.lua\r
 \r
-%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c\r
+@setlocal\r
+@call :SETHOSTVARS\r
+%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% host\buildvm*.c\r
 @if errorlevel 1 goto :BAD\r
 %LJLINK% /out:buildvm.exe buildvm*.obj\r
 @if errorlevel 1 goto :BAD\r
 if exist buildvm.exe.manifest^\r
   %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe\r
+@endlocal\r
 \r
 buildvm -m peobj -o lj_vm.obj\r
 @if errorlevel 1 goto :BAD\r
@@ -124,6 +131,12 @@ if exist luajit.exe.manifest^
 @echo.\r
 @echo === Successfully built LuaJIT for Windows/%LJARCH% ===\r
 \r
+@goto :END\r
+:SETHOSTVARS\r
+@if "%VSCMD_ARG_HOST_ARCH%_%VSCMD_ARG_TGT_ARCH%" equ "x64_arm64" (\r
+  call "%VSINSTALLDIR%Common7\Tools\VsDevCmd.bat" -arch=%VSCMD_ARG_HOST_ARCH% -no_logo\r
+  echo on\r
+)\r
 @goto :END\r
 :BAD\r
 @echo.\r