X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_shared.c;h=683fe0b13aba7b008e1373ed019ac0a3d6e04374;hb=edf66de2a01e845e61d69018c74b030c4f91af0c;hp=9b4aea623989069b6ad652e912625c7ef3609052;hpb=0e936f973c3dcb7f74691912db3ad85e8805ccf1;p=xonotic%2Fdarkplaces.git

diff --git a/sys_shared.c b/sys_shared.c
index 9b4aea62..683fe0b1 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -1,4 +1,3 @@
-
 #include "quakedef.h"
 # include <time.h>
 #ifndef WIN32
@@ -7,64 +6,45 @@
 # include <dlfcn.h>
 #endif
 
-qboolean sys_nostdout = false;
-
 static char sys_timestring[128];
 char *Sys_TimeString(const char *timeformat)
 {
 	time_t mytime = time(NULL);
+#if _MSC_VER >= 1400
+	struct tm mytm;
+	localtime_s(&mytm, &mytime);
+	strftime(sys_timestring, sizeof(sys_timestring), timeformat, &mytm);
+#else
 	strftime(sys_timestring, sizeof(sys_timestring), timeformat, localtime(&mytime));
+#endif
 	return sys_timestring;
 }
 
 
 extern qboolean host_shuttingdown;
-void Sys_Quit (void)
+void Sys_Quit (int returnvalue)
 {
+	if (COM_CheckParm("-profilegameonly"))
+		Sys_AllowProfiling(false);
 	host_shuttingdown = true;
 	Host_Shutdown();
-	exit(0);
+	exit(returnvalue);
 }
 
-char engineversion[128];
+#if defined(__linux__) || defined(__FreeBSD__)
+#ifdef __cplusplus
+extern "C"
+#endif
+int moncontrol(int);
+#endif
 
-void Sys_Shared_EarlyInit(void)
+void Sys_AllowProfiling(qboolean enable)
 {
-	const char* os;
-
-	Memory_Init ();
-	Log_Init ();
-
-	COM_InitArgv();
-	COM_InitGameType();
-
-#if defined(__linux__)
-	os = "Linux";
-#elif defined(WIN32)
-	os = "Windows";
-#elif defined(__FreeBSD__)
-	os = "FreeBSD";
-#elif defined(__NetBSD__)
-	os = "NetBSD";
-#elif defined(__OpenBSD__)
-	os = "OpenBSD";
-#elif defined(MACOSX)
-	os = "Mac OS X";
-#else
-	os = "Unknown";
+#if defined(__linux__) || defined(__FreeBSD__)
+	moncontrol(enable);
 #endif
-	dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
-
-// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from
-	if (COM_CheckParm("-nostdout"))
-		sys_nostdout = 1;
-	else
-		Con_Printf("%s\n", engineversion);
 }
 
-void Sys_Shared_LateInit(void)
-{
-}
 
 /*
 ===============================================================================
@@ -83,29 +63,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++)