From 790396e0f7c7ccaafe161ec7052d7f3ef1890947 Mon Sep 17 00:00:00 2001
From: Jovan Gerodetti <jovan.gerodetti@titannano.de>
Date: Wed, 15 Oct 2025 00:35:40 +0200
Subject: [PATCH] macOS editor needs universal dylib last

---
 .github/workflows/build.yml | 31 +++++++++++++++++++++++++++----
 src/native.gdextension      |  4 ++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f65eec0e..3b2f0dd8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,7 +134,7 @@ jobs:
           lfs: true
       - uses: hustcer/setup-nu@main
         with:
-          version: "0.101.*"
+          version: "0.107.*"
 
       - name: setup Godot
         shell: nu {0}
@@ -195,13 +195,22 @@ jobs:
           let platform_dir = "${{ matrix.vendor }}-${{ matrix.platform }}"
           let release = ${{inputs.release}}
 
+          let x86_path = $"native/target/x86_64-($platform_dir)"
+          let x86_debug = $"($x86_path)/debug/${{ matrix.lib }}"
+          let x86_release = $"($x86_path)/release/${{ matrix.lib }}"
+
+          let aarch64_path = $"native/target/aarch64-($platform_dir)"
+          let aarch64_debug = $"($aarch64_path)/debug/${{ matrix.lib }}"
+          let aarch64_release = $"($aarch64_path)/release/${{ matrix.lib }}"
+
           mkdir $"native/target/universal-($platform_dir)/debug/"
-          lipo -create $"native/target/x86_64-($platform_dir)/debug/${{ matrix.lib }}" $"native/target/aarch64-($platform_dir)/debug/${{ matrix.lib }}" -output $"native/target/universal-($platform_dir)/debug/${{ matrix.lib }}"
+          lipo -create $x86_debug $aarch64_debug -output $"native/target/universal-($platform_dir)/debug/${{ matrix.lib }}"
 
           if $release {
             mkdir $"native/target/universal-($platform_dir)/release/"
-            lipo -create $"native/target/x86_64-($platform_dir)/release/${{ matrix.lib }}" $"native/target/aarch64-($platform_dir)/release/${{ matrix.lib }}" -output $"native/target/universal-($platform_dir)/release/${{ matrix.lib }}"
+            lipo -create $x86_release $aarch64_release -output $"native/target/universal-($platform_dir)/release/${{ matrix.lib }}"
           }
+
       - name: import godot project
         shell: nu {0}
         run: |
@@ -209,6 +218,20 @@ jobs:
 
           godot --headless --verbose --import
 
+      - name: clean up libnative variants
+        if: matrix.platform == 'darwin'
+        shell: nu {0}
+        run: |
+          let platform_dir = "${{ matrix.vendor }}-${{ matrix.platform }}"
+          let release = ${{ inputs.release }}
+          let profile = if $release { "release" } else { "debug" }
+
+          rm -r $"native/target/x86_64-($platform_dir)/($profile)/"
+
+          if $release {
+            rm -r $"native/target/aarch64-($platform_dir)/($profile)/"
+          }
+
       - name: export-debug
         shell: nu {0}
         if: ${{ !inputs.release }}
@@ -223,7 +246,7 @@ jobs:
         run: |
           $env.PATH = $env.PATH | append ("./.godot_bin" | path expand)
           mkdir "${{ env.EXPORT_DIR }}"
-          godot --headless --export-release ${{ env.EXPORT_ARGS }}
+          godot --headless --verbose --export-release ${{ env.EXPORT_ARGS }}
           if (ls -a "${{ env.EXPORT_DIR }}" | length) < 1 { exit 1 }
       - name: describe revision
         id: describe
diff --git a/src/native.gdextension b/src/native.gdextension
index f52cd896..a1a641e3 100644
--- a/src/native.gdextension
+++ b/src/native.gdextension
@@ -7,12 +7,12 @@ reloadable = false
 source = "res://native/"
 
 [libraries]
-macos.debug.universal="res://native/target/universal-apple-darwin/debug/libnative.dylib"
-macos.release.universal="res://native/target/universal-apple-darwin/release/libnative.dylib"
 macos.debug.arm64="res://native/target/aarch64-apple-darwin/debug/libnative.dylib"
 macos.release.arm64="res://native/target/aarch64-apple-darwin/release/libnative.dylib"
 macos.debug.x86_64="res://native/target/x86_64-apple-darwin/debug/libnative.dylib"
 macos.release.x86_64="res://native/target/x86_64-apple-darwin/release/libnative.dylib"
+macos.debug.universal="res://native/target/universal-apple-darwin/debug/libnative.dylib"
+macos.release.universal="res://native/target/universal-apple-darwin/release/libnative.dylib"
 windows.debug.x86_64="res://native/target/x86_64-pc-windows-msvc/debug/native.dll"
 windows.release.x86_64="res://native/target/x86_64-pc-windows-msvc/release/native.dll"
 linux.debug.x86_64="res://native/target/x86_64-unknown-linux-gnu/debug/libnative.so"