Add windows ARM64 builds support

Author: halx99

.github/workflows/build.yml

@@ -300,20 +300,16 @@ jobs:
         arch:
           - x86
           - x64
+          - arm64
     env:
       NO_DLL: ${{ github.event.inputs.no_dll }}
       BUILD_ARCH: ${{ matrix.arch }}
-      TOOLSET: '14.39'
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v6
 
-      # - name: setup-msvc
-      #   shell: pwsh
-      #   run: .\1k\setup-msvc.ps1 -ver $env:TOOLSET -arch $env:BUILD_ARCH
-
       - name: Build
         shell: pwsh
         run: .\build.ps1 -p win32 -a $env:BUILD_ARCH -libs '${{ github.event.inputs.libs }}'
@@ -337,17 +333,12 @@ jobs:
     env:
       NO_DLL: ${{ github.event.inputs.no_dll }}
       BUILD_ARCH: ${{ matrix.arch }}
-      TOOLSET: '14.39'
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v6
 
-      # - name: setup-msvc
-      #   shell: pwsh
-      #   run: .\1k\setup-msvc.ps1 -ver $env:TOOLSET -arch $env:BUILD_ARCH
-
       - name: Build
         shell: pwsh
         run: .\build.ps1 -p winrt -a $env:BUILD_ARCH -libs '${{ github.event.inputs.libs }}'

1k/dist.sh

@@ -80,6 +80,7 @@ function dist_lib {
         if [ "$CONF_TEMPLATE" = "config.h.in" ] ; then
             mkdir -p ${DIST_DIR}/include/win-x86/${INC_DIR}
             mkdir -p ${DIST_DIR}/include/win-x64/${INC_DIR}
+            mkdir -p ${DIST_DIR}/include/win-arm64/${INC_DIR}
             mkdir -p ${DIST_DIR}/include/winrt-x64/${INC_DIR}
             mkdir -p ${DIST_DIR}/include/winrt-arm64/${INC_DIR}
             mkdir -p ${DIST_DIR}/include/linux-x64/${INC_DIR}
@@ -124,6 +125,7 @@ function dist_lib {
             if [ "$CONF_TEMPLATE" = "config.h.in" ] ; then
                 cp install_win32_x86/${LIB_NAME}/include/${INC_DIR}${CONF_HEADER} ${DIST_DIR}/include/win-x86/${INC_DIR}
                 cp install_win32_x64/${LIB_NAME}/include/${INC_DIR}${CONF_HEADER} ${DIST_DIR}/include/win-x64/${INC_DIR}
+                cp install_win32_arm64/${LIB_NAME}/include/${INC_DIR}${CONF_HEADER} ${DIST_DIR}/include/win-arm64/${INC_DIR}
                 cp install_winrt_x64/${LIB_NAME}/include/${INC_DIR}${CONF_HEADER} ${DIST_DIR}/include/winrt-x64/${INC_DIR}
                 cp install_winrt_arm64/${LIB_NAME}/include/${INC_DIR}${CONF_HEADER} ${DIST_DIR}/include/winrt-arm64/${INC_DIR}
                 cp install_linux_x64/${LIB_NAME}/include/${INC_DIR}${CONF_HEADER} ${DIST_DIR}/include/linux-x64/${INC_DIR}
@@ -158,6 +160,10 @@ function dist_lib {
         mkdir -p ${DIST_DIR}/lib/win32/x64
         copy1k "install_win32_x64/${LIB_NAME}/lib/*.lib" ${DIST_DIR}/lib/win32/x64/
         copy1k "install_win32_x64/${LIB_NAME}/bin/*.dll" ${DIST_DIR}/lib/win32/x64/
+
+        mkdir -p ${DIST_DIR}/lib/win32/arm64
+        copy1k "install_win32_arm64/${LIB_NAME}/lib/*.lib" ${DIST_DIR}/lib/win32/arm64/
+        copy1k "install_win32_arm64/${LIB_NAME}/bin/*.dll" ${DIST_DIR}/lib/win32/arm64/
     fi
 
     if [ $(($DIST_FLAGS & $DISTF_WINRT)) != 0 ]; then

README.md

@@ -41,7 +41,7 @@ for example, if you use git to clone axmol(~80MB) and run it's `setup.ps1`, then
   - x86_64
 - linux: 
   - x86_64
-  - arm64
+  - arm64 (since v114)
 - ios:
   - arm64
   - arm64 simulator

src/openssl/build1.ps1

@@ -13,30 +13,17 @@ $env:CXX = $null
 
 if ($target_os.StartsWith('win')) {
     # require preinstalled perl interpreter: https://strawberryperl.com/releases.html
-    if ($target_cpu -eq "x86") {
-        if (!$is_winrt) {
-            $TARGET_OPTIONS += 'VC-WIN32'
-        }
-        else {
-            $TARGET_OPTIONS += 'VC-WIN32-UWP'
+    switch($target_cpu) {
+        'x86' { $ossl_cpu_opt = 'VC-WIN32' }
+        'x64' { $ossl_cpu_opt = 'VC-WIN64A' }
+        'arm64' { $ossl_cpu_opt = 'VC-WIN64-ARM' }
+        default {
+            throw "Unsupported arch: $target_cpu"
         }
     }
-    else {
-        if (!$is_winrt) {
-            $TARGET_OPTIONS += 'VC-WIN64A'
-        }
-        else {
-            if ($target_cpu -eq 'x64') {
-                $TARGET_OPTIONS += 'VC-WIN64A-UWP'
-            }
-            elseif ($target_cpu -eq 'arm64') {
-                $TARGET_OPTIONS += 'VC-WIN64-ARM-UWP'
-            }
-            else {
-                Write-Output "Unsupported arch: $target_cpu"
-                return 1
-            }
-        }
+
+    if ($is_winrt) {
+        $ossl_cpu_opt += '-UWP'
     }
 
     if ($env:NO_DLL -eq 'true') {