summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Hübner <profan@prfn.se>2018-04-28 14:36:35 +0200
committerRobin Hübner <profan@prfn.se>2018-04-28 14:36:35 +0200
commit828744195526e44a30d07c232db25066cf0fc984 (patch)
treef3d14882f20d15ed396586e37fa9155d875f2352
parent8d199a9b2c71de3c5218a636249171b60a832092 (diff)
GDNative Unix: fix shared lib loading, dlopen expects leading ./ to interpret as relative path.
-rw-r--r--drivers/unix/os_unix.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 31c8e4ade9..eeb3b31fc2 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -349,6 +349,12 @@ Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle
String path = p_path;
+ if (FileAccess::exists(path) && path.is_rel_path()) {
+ // dlopen expects a slash, in this case a leading ./ for it to be interpreted as a relative path,
+ // otherwise it will end up searching various system directories for the lib instead and finally failing.
+ path = "./" + path;
+ }
+
if (!FileAccess::exists(path)) {
//this code exists so gdnative can load .so files from within the executable path
path = get_executable_path().get_base_dir().plus_file(p_path.get_file());