|
@@ -239,11 +239,21 @@ Error OS_IOS::open_dynamic_library(const String p_path, void *&p_library_handle,
|
|
path = get_framework_executable(get_executable_path().get_base_dir().path_join(p_path.get_file()));
|
|
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)) {
|
|
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()));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ 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);
|
|
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() + ".");
|
|
ERR_FAIL_COND_V_MSG(!p_library_handle, ERR_CANT_OPEN, "Can't open dynamic library: " + p_path + ", error: " + dlerror() + ".");
|
|
|
|
|