Răsfoiți Sursa

Merge pull request #13850 from endragor/fix-iphone-gdnative

Fix open_dynamic_library override in OSIPhone
Juan Linietsky 7 ani în urmă
părinte
comite
af27414b1c
2 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 2 2
      platform/iphone/os_iphone.cpp
  2. 1 1
      platform/iphone/os_iphone.h

+ 2 - 2
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) {

+ 1 - 1
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);