Add windows Arm64

openframeworks · Apr 7, 2024 · 2d9ae6e · 2d9ae6e
1 parent 38aa061
commit 2d9ae6e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/.github/actions/build-package/action.yaml b/.github/actions/build-package/action.yaml
@@ -7,10 +7,17 @@ runs:
     - uses: seanmiddleditch/gha-setup-ninja@master
 
     - uses: ilammy/msvc-dev-cmd@v1
-      if: contains(matrix.cfg.ARCHITECTURE, '-x64-')
+      if: contains(matrix.cfg.ARCHITECTURE, '-x64-msvc')
       with:
         arch: x64
 
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: contains(matrix.cfg.ARCHITECTURE, '-arm64-msvc')
+      with:
+        arch: amd64_arm64
+
+    # TODO: Add Windows ARM64EC architecture
+
     - uses: shogo82148/actions-setup-perl@v1
       with:
         perl-version: '5.32'

diff --git a/.github/workflows/build-assimp.yaml b/.github/workflows/build-assimp.yaml
@@ -24,8 +24,9 @@ jobs:
           - { os: ubuntu-20.04, triple: linux-x64-gcc9 }
           - { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
           - { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
-          - { os: windows-2022, triple: windows-x64-mingw64 }
           - { os: windows-2022, triple: windows-x64-msvc }
+          - { os: windows-2022, triple: windows-arm64-msvc }
+          - { os: windows-2022, triple: windows-x64-mingw64 }
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/build-freeimage.yaml b/.github/workflows/build-freeimage.yaml
@@ -24,8 +24,9 @@ jobs:
           - { os: ubuntu-20.04, triple: linux-x64-gcc9 }
           - { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
           - { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
-          - { os: windows-2022, triple: windows-x64-mingw64 }
           - { os: windows-2022, triple: windows-x64-msvc }
+          - { os: windows-2022, triple: windows-arm64-msvc }
+          - { os: windows-2022, triple: windows-x64-mingw64 }
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/build-libcurl.yaml b/.github/workflows/build-libcurl.yaml
@@ -24,8 +24,9 @@ jobs:
           - { os: ubuntu-20.04, triple: linux-x64-gcc9 }
           - { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
           - { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
-          - { os: windows-2022, triple: windows-x64-mingw64 }
           - { os: windows-2022, triple: windows-x64-msvc }
+          - { os: windows-2022, triple: windows-arm64-msvc }
+          - { os: windows-2022, triple: windows-x64-mingw64 }
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/build-mbedtls.yaml b/.github/workflows/build-mbedtls.yaml
@@ -24,8 +24,9 @@ jobs:
           - { os: ubuntu-20.04, triple: linux-x64-gcc9 }
           - { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
           - { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
-          - { os: windows-2022, triple: windows-x64-mingw64 }
           - { os: windows-2022, triple: windows-x64-msvc }
+          - { os: windows-2022, triple: windows-arm64-msvc }
+          - { os: windows-2022, triple: windows-x64-mingw64 }
 
     steps:
       - name: Checkout repository

diff --git a/toolchains/windows-arm64-msvc.cmake b/toolchains/windows-arm64-msvc.cmake
@@ -0,0 +1,6 @@
+set (CMAKE_SYSTEM_NAME Windows)
+
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)