Skip to content
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

Jump to bottom

[GDExtension] Improve macOS library loading/export. #98809

Merged
merged 1 commit into from
Nov 10, 2024
Merged

[GDExtension] Improve macOS library loading/export. #98809

merged 1 commit into from
Nov 10, 2024

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Nov 4, 2024

Fixes godotengine/godot-proposals#11084

  • Adds support for loading libraries with explicitly specified universal tag (previously was only supported during export).
  • Adds support for exporting separate x86_64/arm64 libraries.
  • Adds warning if multiple libs for the same architecture were found (e.g, both universal and arm64).
  • Do not stop extension export if only library for some of supported architectures exist.

@bruvzg bruvzg added this to the 4.4 milestone Nov 4, 2024
@bruvzg bruvzg requested review from a team as code owners November 4, 2024 07:35
Ivorforce
Ivorforce approved these changes Nov 4, 2024
View reviewed changes
Copy link
Contributor

@Ivorforce Ivorforce left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! The implementation looks good to me, and I agree it is a good way to address GOP#11084.

editor/plugins/gdextension_export_plugin.h
int count = 0;
Vector<String> libs;
};
HashMap<String, FoundLibInfo> libs_found;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a comment would be good that libs_found only exists for warning purposes.

@dsnopek dsnopek requested a review from a team November 4, 2024 22:20
dsnopek
dsnopek approved these changes Nov 4, 2024
View reviewed changes
Copy link
Contributor

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

I haven't tested, but the code looks good to me.

@Ivorforce Ivorforce mentioned this pull request Nov 5, 2024
Open
@Repiteo Repiteo merged commit c4a52e1 into godotengine:master Nov 10, 2024
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Nov 10, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsnopek dsnopek dsnopek approved these changes

@Ivorforce Ivorforce Ivorforce approved these changes

Assignees
No one assigned
Labels
bug enhancement platform:macos topic:export topic:gdextension
Projects
None yet
Milestone
4.4
Development

Successfully merging this pull request may close these issues.

On macOS, support non-universal GDExtension binaries for export (or discourage them explicitly)
4 participants
@bruvzg @Repiteo @dsnopek @Ivorforce