DP_PRELOAD_DEPENDENCIES=yes makefile option: when set, link against the libraries...

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 6cd86758ad9d76a0edda0257ddfb8ac8b3603de9..64ca6abfb29961211dbfb9854c03b3aa03e412f5 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -1,4 +1,3 @@
-
 #include "quakedef.h"
 # include <time.h>
 #ifndef WIN32
@@ -17,11 +16,11 @@ char *Sys_TimeString(const char *timeformat)
 
 
 extern qboolean host_shuttingdown;
-void Sys_Quit (void)
+void Sys_Quit (int returnvalue)
 {
        host_shuttingdown = true;
        Host_Shutdown();
-       exit(0);
+       exit(returnvalue);
 }
 
 /*
@@ -41,29 +40,74 @@ qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllf
        if (handle == NULL)
                return false;
 
+#ifndef WIN32
+#ifdef PREFER_PRELOAD
+       dllhandle = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
+       if(dllhandle)
+       {
+               for (func = fcts; func && func->name != NULL; func++)
+                       if (!(*func->funcvariable = (void *) Sys_GetProcAddress (dllhandle, func->name)))
+                       {
+                               dlclose(dllhandle);
+                               goto notfound;
+                       }
+               Con_Printf ("All of %s's functions were already linked in! Not loading dynamically...\n", dllnames[0]);
+               *handle = dllhandle;
+               return true;
+       }
+notfound:
+#endif
+#endif
+
        // Initializations
        for (func = fcts; func && func->name != NULL; func++)
                *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]);
+       // 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], '/'))
+       {
+               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));
+                       Con_Printf (" \"%s\"", temp);
+#ifdef WIN32
+                       dllhandle = LoadLibrary (temp);
+#else
+                       dllhandle = dlopen (temp, RTLD_LAZY | RTLD_GLOBAL);
+#endif
+                       if (dllhandle)
+                               break;
+               }
        }
 
        // No DLL found
        if (! dllhandle)
+       {
+               Con_Printf(" - failed.\n");
                return false;
+       }
 
-       Con_Printf("\"%s\" loaded.\n", dllnames[i]);
+       Con_Printf(" - loaded.\n");
 
        // Get the function adresses
        for (func = fcts; func && func->name != NULL; func++)