Merge pull request #1811 from tobil4sk/ci-mac-arm64-ndll

[ci] Add mac arm64 ndll to lime package
openfl · Jul 7, 2024 · 3a61390 · 3a61390
2 parents e257b7e + d5b3294
commit 3a61390
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -120,7 +120,8 @@ jobs:
 
       - name: Install Haxe dependencies
         run: |
-          haxelib install hxcpp 4.2.1 --quiet
+          curl -LO https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
+          haxelib install ./hxcpp-4.3.45.zip --quiet
           haxelib install format --quiet
           haxelib install hxp --quiet
 
@@ -137,6 +138,7 @@ jobs:
       - name: Rebuild Lime (macOS)
         run: |
           lime rebuild macos -clean -release -64 -nocolor -verbose -nocffi
+          lime rebuild macos -clean -release -arm64 -nocolor -verbose -nocffi
           lime rebuild hl -clean -release -nocolor -verbose -nocffi
 
       - uses: actions/upload-artifact@v3
@@ -147,6 +149,14 @@ jobs:
             !**/.gitignore
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: MacArm64-NDLL
+          path: |
+            ndll/MacArm64/
+            !**/.gitignore
+          if-no-files-found: error
+
       - uses: actions/upload-artifact@v3
         with:
           name: Mac64-Hashlink
@@ -466,6 +476,11 @@ jobs:
           name: Mac64-NDLL
           path: ndll/Mac64/
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: MacArm64-NDLL
+          path: ndll/MacArm64/
+
       - uses: actions/download-artifact@v3
         with:
           name: Windows-NDLL

diff --git a/ndll/MacArm64/.gitignore b/ndll/MacArm64/.gitignore
diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx
@@ -435,6 +435,10 @@ class MacPlatform extends PlatformTarget
 					// TODO: Support single binary
 					commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64", "-Dhashlink"]);
 				}
+				else if (targetFlags.exists("arm64"))
+				{
+					commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_ARM64"]);
+				}
 				else if (!targetFlags.exists("32"))
 				{
 					commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64"]);