[iOS] Fix loading of GDExtension dylibs auto converted to framework.

(cherry picked from commit ad4d565)
akien-mga · May 12, 2023 · ebaf3cc · ebaf3cc
1 parent 268b60d
commit ebaf3cc
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm
@@ -239,11 +239,21 @@ void register_dynamic_symbol(char *name, void *address) {
 		path = get_framework_executable(get_executable_path().get_base_dir().path_join(p_path.get_file()));
 	}
 
+	if (!FileAccess::exists(path)) {
+		// Load .dylib converted to framework from within the executable path.
+		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 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()));
 	}
 
+	if (!FileAccess::exists(path)) {
+		// Load .dylib converted to 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().get_basename() + ".framework"));
+	}
+
 	p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW);
 	ERR_FAIL_COND_V_MSG(!p_library_handle, ERR_CANT_OPEN, "Can't open dynamic library: " + p_path + ", error: " + dlerror() + ".");