From 5eafeb047d31f25aa957c780085e543c61098863 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Sat, 6 Jul 2024 14:04:29 +0100
Subject: [PATCH 1/3] [tools] Support cross compiling arm64 ndll on mac

---
 tools/platforms/MacPlatform.hx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx
index 7fbe55a89..09322efcb 100644
--- 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"]);

From da9be4acc01da7b88b1b6e24aed410d1ad29a656 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Sat, 6 Jul 2024 14:04:52 +0100
Subject: [PATCH 2/3] [ci] Build and include arm64 mac ndll

---
 .github/workflows/main.yml | 14 ++++++++++++++
 ndll/MacArm64/.gitignore   |  0
 2 files changed, 14 insertions(+)
 create mode 100644 ndll/MacArm64/.gitignore

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 85015a659..c68aa6c4e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -137,6 +137,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 +148,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 +475,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
new file mode 100644
index 000000000..e69de29bb

From d5b3294b20847d65fee5b9e97260b30caa6c4d47 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Sat, 6 Jul 2024 14:39:44 +0100
Subject: [PATCH 3/3] [ci] Use updated hxcpp to build mac arm64 ndll

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c68aa6c4e..ac1d9b918 100644
--- 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