Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112784 from migueldeicaza/fix_dynamic_xcframework_loading

Browse source 
iOS: Fix loading of xcframework dynamic libraries.
This commit is contained in:
Thaddeus Crews 2025-11-18 08:25:45 -06:00
commit eafc21fb05
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/extension/gdextension_library_loader.cpp
View file

@ -195,9 +195,13 @@ Error GDExtensionLibraryLoader::open_library(const String &p_path) {
&abs_dependencies_paths, // library_dependencies &abs_dependencies_paths, // library_dependencies
}; };
err = OS::get_singleton()->open_dynamic_library(is_static_library ? String() : abs_path, library, &data); // Apple has a complex lookup system which goes beyond looking up the filename, so we try that first.
err = OS::get_singleton()->open_dynamic_library(abs_path, library, &data);
if (err != OK) { if (err != OK) {
return err; err = OS::get_singleton()->open_dynamic_library(String(), library, &data);
if (err != OK) {
return err;
}
} }
return OK; return OK;
@ -361,8 +365,6 @@ Error GDExtensionLibraryLoader::parse_gdextension_file(const String &p_path) {
return ERR_FILE_NOT_FOUND; return ERR_FILE_NOT_FOUND;
} }
is_static_library = library_path.ends_with(".a") || library_path.ends_with(".xcframework");
if (!library_path.is_resource_file() && !library_path.is_absolute_path()) { if (!library_path.is_resource_file() && !library_path.is_absolute_path()) {
library_path = p_path.get_base_dir().path_join(library_path); library_path = p_path.get_base_dir().path_join(library_path);
} }

2
core/extension/gdextension_library_loader.h
View file

@ -49,8 +49,6 @@ private:
String library_path; String library_path;
String entry_symbol; String entry_symbol;
bool is_static_library = false;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
bool is_reloadable = false; bool is_reloadable = false;
#endif #endif

15
drivers/apple_embedded/os_apple_embedded.mm
View file

@ -279,6 +279,11 @@ Error OS_AppleEmbedded::open_dynamic_library(const String &p_path, void *&p_libr
path = get_framework_executable(get_executable_path().get_base_dir().path_join(p_path.get_file().get_basename() + ".framework")); path = get_framework_executable(get_executable_path().get_base_dir().path_join(p_path.get_file().get_basename() + ".framework"));
} }
if (!FileAccess::exists(path)) {
// Load .dylib from within the executable path.
path = get_framework_executable(get_executable_path().get_base_dir().path_join(p_path.get_file().get_basename() + ".dylib"));
}
if (!FileAccess::exists(path)) { if (!FileAccess::exists(path)) {
// Load .dylib or framework from a standard iOS location. // Load .dylib or framework from a standard iOS location.
path = get_framework_executable(get_executable_path().get_base_dir().path_join("Frameworks").path_join(p_path.get_file())); path = get_framework_executable(get_executable_path().get_base_dir().path_join("Frameworks").path_join(p_path.get_file()));
@ -289,8 +294,16 @@ Error OS_AppleEmbedded::open_dynamic_library(const String &p_path, void *&p_libr
path = get_framework_executable(get_executable_path().get_base_dir().path_join("Frameworks").path_join(p_path.get_file().get_basename() + ".framework")); path = get_framework_executable(get_executable_path().get_base_dir().path_join("Frameworks").path_join(p_path.get_file().get_basename() + ".framework"));
} }
ERR_FAIL_COND_V(!FileAccess::exists(path), ERR_FILE_NOT_FOUND); if (!FileAccess::exists(path)) {
// Load .dylib from a standard iOS location.
path = get_framework_executable(get_executable_path().get_base_dir().path_join("Frameworks").path_join(p_path.get_file().get_basename() + ".dylib"));
}
if (!FileAccess::exists(path) && (p_path.ends_with(".a") || p_path.ends_with(".xcframework"))) {
path = String(); // Try loading static library.
} else {
ERR_FAIL_COND_V(!FileAccess::exists(path), ERR_FILE_NOT_FOUND);
}
p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW);
ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror()));