diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-20 22:56:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 22:56:15 +0100 |
| commit | 71a3e71b61690663f5bc6b1b091f578a6d6915f7 (patch) | |
| tree | 380303c58fff0dd7e2e6aa4c4b192e48e4a23037 /modules/gdnative/gdnative.cpp | |
| parent | 6065b2d1778cd5dc8c078f3b59e501fb8ccdec9f (diff) | |
| parent | 8f0f327f0207cbde27bbfba3ac106b9457d7201b (diff) | |
| download | redot-engine-71a3e71b61690663f5bc6b1b091f578a6d6915f7.tar.gz | |
Merge pull request #11783 from endragor/ios-export-frameworks
Allow exporting third-party iOS Frameworks
Diffstat (limited to 'modules/gdnative/gdnative.cpp')
| -rw-r--r-- | modules/gdnative/gdnative.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index f98a16a5d7..de118043ca 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -123,7 +123,7 @@ bool GDNative::initialize() { return false; } #ifdef IPHONE_ENABLED - String path = lib_path.replace("res://", "dylibs/"); + String path = ""; #else String path = ProjectSettings::get_singleton()->globalize_path(lib_path); #endif @@ -148,7 +148,7 @@ bool GDNative::initialize() { // we cheat here a little bit. you saw nothing initialized = true; - err = get_symbol(library->get_symbol_prefix() + init_symbol, library_init); + err = get_symbol(library->get_symbol_prefix() + init_symbol, library_init, false); initialized = false; @@ -280,7 +280,7 @@ Variant GDNative::call_native(StringName p_native_call_type, StringName p_proced return *(Variant *)&result; } -Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle) { +Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle, bool p_optional) { if (!initialized) { ERR_PRINT("No valid library handle, can't get symbol from GDNative object"); @@ -291,7 +291,7 @@ Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle) { native_handle, p_procedure_name, r_handle, - true); + p_optional); return result; } |
