Skip to content

macOS editor needs universal dylib last #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TitanNano merged 1 commit into from
Oct 15, 2025
Merged

macOS editor needs universal dylib last #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -195,20 +195,43 @@ 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: |
$env.PATH = $env.PATH | append ("./.godot_bin" | path expand)

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 }}
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/native.gdextension
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down