diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-12-03 04:57:03 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-03 04:57:03 -0300 |
| commit | af27414b1c10173584539186e396668a899e06b2 (patch) | |
| tree | 685d44d1102008ff2d3020dfab78e505a6a145c5 /platform | |
| parent | 25fe02eca049e4f96e35104146967e7c32d1171a (diff) | |
| parent | 59451c5b8d669e7900c7fdff51b813377ac5a040 (diff) | |
Merge pull request #13850 from endragor/fix-iphone-gdnative
Fix open_dynamic_library override in OSIPhone
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 4 | ||||
| -rw-r--r-- | platform/iphone/os_iphone.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index fbe3bd310d..f06657cd7b 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -394,12 +394,12 @@ void OSIPhone::alert(const String &p_alert, const String &p_title) { iOS::alert(utf8_alert.get_data(), utf8_title.get_data()); } -Error OSIPhone::open_dynamic_library(const String p_path, void *&p_library_handle) { +Error OSIPhone::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) { if (p_path.length() == 0) { p_library_handle = RTLD_SELF; return OK; } - return OS_Unix::open_dynamic_library(p_path, p_library_handle); + return OS_Unix::open_dynamic_library(p_path, p_library_handle, p_also_set_library_path); } Error OSIPhone::close_dynamic_library(void *p_library_handle) { diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index 1ef673765a..3f989b49be 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -155,7 +155,7 @@ public: virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); - virtual Error open_dynamic_library(const String p_path, void *&p_library_handle); + virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false); virtual Error close_dynamic_library(void *p_library_handle); virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false); |