Support other toolsets in Win/ARM64 build

diff --git a/build-test.cmd b/build-test.cmd
index dbb4e8a..514bb23 100644 (file)
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -473,6 +473,11 @@ if /i "%__ToolsetDir%" == "" (
     exit /b 1
 )
 
+if not exist "%__ToolsetDir%"\buildenv_arm64.cmd goto :Not_EWDK
+call "%__ToolsetDir%"\buildenv_arm64.cmd
+exit /b 0
+
+:Not_EWDK
 set PATH=%__ToolsetDir%\VC_sdk\bin;%PATH%
 set LIB=%__ToolsetDir%\VC_sdk\lib\arm64;%__ToolsetDir%\sdpublic\sdk\lib\arm64
 set INCLUDE=^
@@ -514,4 +519,4 @@ if %__exitCode% neq 0 (
 )
     
 echo Successfully precompiled %2
-exit /b 0
\ No newline at end of file
+exit /b 0

diff --git a/build.cmd b/build.cmd
index 904bb02..64945cc 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -687,6 +687,11 @@ if /i "%__ToolsetDir%" == "" (
     exit /b 1
 )
 
+if not exist "%__ToolsetDir%"\buildenv_arm64.cmd goto :Not_EWDK
+call "%__ToolsetDir%"\buildenv_arm64.cmd
+exit /b 0
+
+:Not_EWDK
 set PATH=%__ToolsetDir%\VC_sdk\bin;%PATH%
 set LIB=%__ToolsetDir%\VC_sdk\lib\arm64;%__ToolsetDir%\sdpublic\sdk\lib\arm64
 set INCLUDE=^