diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-22 12:51:33 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-22 12:51:33 +0200 |
| commit | 0156bc203986153ac563e6fa8cc6200033a94bf1 (patch) | |
| tree | 643290135de0d48c3928127c21f9424f9c928310 /drivers/unix/os_unix.cpp | |
| parent | 79557e7d0bd54ad63c38499b8bb083416fc386d9 (diff) | |
| parent | 764de7fe3195c28be1d9b8abc26ffdf394e87cb3 (diff) | |
| download | redot-engine-0156bc203986153ac563e6fa8cc6200033a94bf1.tar.gz | |
Merge pull request #88381 from m4gr3d/fix_gdextension_dependencies_load_on_android
Fix loading GDExtension dependencies on Android
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 1a8cd53486..0a79c8014b 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -784,7 +784,7 @@ String OS_Unix::get_locale() const { return locale; } -Error OS_Unix::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path, bool p_generate_temp_files) { +Error OS_Unix::open_dynamic_library(const String &p_path, void *&p_library_handle, GDExtensionData *p_data) { String path = p_path; if (FileAccess::exists(path) && path.is_relative_path()) { @@ -808,8 +808,8 @@ Error OS_Unix::open_dynamic_library(const String &p_path, void *&p_library_handl p_library_handle = dlopen(path.utf8().get_data(), GODOT_DLOPEN_MODE); ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); - if (r_resolved_path != nullptr) { - *r_resolved_path = path; + if (p_data != nullptr && p_data->r_resolved_path != nullptr) { + *p_data->r_resolved_path = path; } return OK; |