godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23355 from buresu/fix-gdnative-loading-on-mac 

GDNative: Fixes a library path problem after exporting app for OSX
This commit is contained in:
Rémi Verschelde 2018-10-29 10:38:55 +01:00 committed by GitHub
parent f7b6d41fe7 63cba9ba62
commit 5e999414d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdnative/gdnative.cpp
View File

@ -306,6 +306,13 @@ bool GDNative::initialize() {
#elif defined(UWP_ENABLED) #elif defined(UWP_ENABLED)
// On UWP we use a relative path from the app // On UWP we use a relative path from the app
String path = lib_path.replace("res://", ""); String path = lib_path.replace("res://", "");
#elif defined(OSX_ENABLED)
// On OSX the exported libraries are located under the Frameworks directory.
// So we need to replace the library path.
String path = ProjectSettings::get_singleton()->globalize_path(lib_path);
if (!FileAccess::exists(path)) {
path = OS::get_singleton()->get_executable_path().get_base_dir().plus_file("../Frameworks").plus_file(lib_path.get_file());
}
#else #else
String path = ProjectSettings::get_singleton()->globalize_path(lib_path); String path = ProjectSettings::get_singleton()->globalize_path(lib_path);
#endif #endif