diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85015a6599..ac1d9b9189 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 @@ -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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx index 7fbe55a89e..09322efcb3 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"]);