Added the RTLD_GLOBAL flag to the dlopen call, since some systems seem to require...

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index ed4a487f1c7369cb599b1452f57880212738ba7b..9abc08d4926dcca45503509a1f8317637e04aca2 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -46,52 +46,50 @@ qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllf
                *func->funcvariable = NULL;
 
        // Try every possible name
+       Con_Printf ("Trying to load library...");
        for (i = 0; dllnames[i] != NULL; i++)
        {
+               Con_Printf (" \"%s\"", dllnames[i]);
 #ifdef WIN32
                dllhandle = LoadLibrary (dllnames[i]);
 #else
-               dllhandle = dlopen (dllnames[i], RTLD_LAZY);
+               dllhandle = dlopen (dllnames[i], RTLD_LAZY | RTLD_GLOBAL);
 #endif
                if (dllhandle)
                        break;
-
-               Con_Printf ("Can't load \"%s\".\n", dllnames[i]);
        }
 
-       // No DLL found
-       if (! dllhandle)
+       // see if the names can be loaded relative to the executable path
+       // (this is for Mac OSX which does not check next to the executable)
+       if (!dllhandle && strrchr(com_argv[0], '/'))
        {
-               // see if the names can be loaded relative to the executable path
-               // (this is for Mac OSX which does not check next to the executable)
-               if (strrchr(com_argv[0], '/'))
+               char path[MAX_OSPATH];
+               strlcpy(path, com_argv[0], sizeof(path));
+               strrchr(path, '/')[1] = 0;
+               for (i = 0; dllnames[i] != NULL; i++)
                {
-                       char path[MAX_OSPATH];
-                       strlcpy(path, com_argv[0], sizeof(path));
-                       strrchr(path, '/')[1] = 0;
-                       for (i = 0; dllnames[i] != NULL; i++)
-                       {
-                               char temp[MAX_OSPATH];
-                               strlcpy(temp, path, sizeof(temp));
-                               strlcat(temp, dllnames[i], sizeof(temp));
+                       char temp[MAX_OSPATH];
+                       strlcpy(temp, path, sizeof(temp));
+                       strlcat(temp, dllnames[i], sizeof(temp));
+                       Con_Printf (" \"%s\"", temp);
 #ifdef WIN32
-                               dllhandle = LoadLibrary (temp);
+                       dllhandle = LoadLibrary (temp);
 #else
-                               dllhandle = dlopen (temp, RTLD_LAZY);
+                       dllhandle = dlopen (temp, RTLD_LAZY | RTLD_GLOBAL);
 #endif
-                               if (dllhandle)
-                                       break;
-
-                               Con_Printf ("Can't load \"%s\".\n", temp);
-                       }
-                       if (! dllhandle)
-                               return false;
+                       if (dllhandle)
+                               break;
                }
-               else
-                       return false;
        }
 
-       Con_Printf("\"%s\" loaded.\n", dllnames[i]);
+       // No DLL found
+       if (! dllhandle)
+       {
+               Con_Printf(" - failed.\n");
+               return false;
+       }
+
+       Con_Printf(" - loaded.\n");
 
        // Get the function adresses
        for (func = fcts; func && func->name != NULL; func++)