X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_shared.c;h=e332f23b110246310393d4dd5d5fbc8cd2bb7d93;hb=0144ec3bdff2b7e8397be064cb7850a1ece7bce9;hp=37c48306f2d5dce2258cfe3b028a459a71b15250;hpb=426d3967446d906a9612ae09e6748d3dad26c60f;p=xonotic%2Fdarkplaces.git diff --git a/sys_shared.c b/sys_shared.c index 37c48306..e332f23b 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -1,4 +1,3 @@ - #include "quakedef.h" # include #ifndef WIN32 @@ -7,48 +6,6 @@ # include #endif -extern cvar_t timestamps; -extern cvar_t timeformat; - -static int sys_nostdout = false; - -/* The translation table between the graphical font and plain ASCII --KB */ -static char qfont_table[256] = { - '\0', '#', '#', '#', '#', '.', '#', '#', - '#', 9, 10, '#', ' ', 13, '.', '.', - '[', ']', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '.', '<', '=', '>', - ' ', '!', '"', '#', '$', '%', '&', '\'', - '(', ')', '*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', ':', ';', '<', '=', '>', '?', - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', - 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', - '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', - 'x', 'y', 'z', '{', '|', '}', '~', '<', - - '<', '=', '>', '#', '#', '.', '#', '#', - '#', '#', ' ', '#', ' ', '>', '.', '.', - '[', ']', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '.', '<', '=', '>', - ' ', '!', '"', '#', '$', '%', '&', '\'', - '(', ')', '*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', ':', ';', '<', '=', '>', '?', - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', - 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', - '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', - 'x', 'y', 'z', '{', '|', '}', '~', '<' -}; - static char sys_timestring[128]; char *Sys_TimeString(const char *timeformat) { @@ -58,81 +15,24 @@ char *Sys_TimeString(const char *timeformat) } -#define MAXPRINTMSG 16384 - -void Sys_Print(const char *msg) -{ - unsigned char *p; - // String we print - char final[MAXPRINTMSG]; - - if (sys_nostdout) - return; - - if (timestamps.integer) - snprintf(final, sizeof(final), "%s%s", Sys_TimeString(timeformat.string), msg); - else - strlcpy (final, msg, sizeof (final)); - - // LordHavoc: make sure the string is terminated - final[MAXPRINTMSG-1] = 0; - for (p = (unsigned char *) final;*p; p++) - *p = qfont_table[*p]; - Sys_PrintToTerminal(final); -} - -void Sys_Printf(const char *fmt, ...) -{ - va_list argptr; - char msg[MAXPRINTMSG]; // String we started with - - va_start(argptr,fmt); - vsnprintf(msg,sizeof(msg),fmt,argptr); - va_end(argptr); - - Sys_Print(msg); -} - -void Sys_Quit (void) +extern qboolean host_shuttingdown; +void Sys_Quit (int returnvalue) { + if (COM_CheckParm("-profilegameonly")) + Sys_AllowProfiling(false); + host_shuttingdown = true; Host_Shutdown(); - exit(0); + exit(returnvalue); } -char engineversion[128]; - -void Sys_Shared_EarlyInit(void) +void Sys_AllowProfiling(qboolean enable) { - const char* os; - - Memory_Init (); - - COM_InitArgv(); - COM_InitGameType(); - -#if defined(__linux__) - os = "Linux"; -#elif defined(WIN32) - os = "Windows"; -#elif defined(__NetBSD__) - os = "NetBSD"; -#elif defined(__OpenBSD__) - os = "OpenBSD"; -#else - os = "Unknown"; +#if defined(__linux__) || defined(__FreeBSD__) +int moncontrol(int); + moncontrol(enable); #endif - snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring); - -// COMMANDLINEOPTION: -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) -{ -} /* =============================================================================== @@ -142,30 +42,84 @@ DLL MANAGEMENT =============================================================================== */ -qboolean Sys_LoadLibrary (const char* dllname, dllhandle_t* handle, const dllfunction_t *fcts) +qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllfunction_t *fcts) { const dllfunction_t *func; - dllhandle_t dllhandle; + dllhandle_t dllhandle = 0; + unsigned int i; 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; - // Load the DLL + // 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 | RTLD_GLOBAL); +#endif + if (dllhandle) + break; + } + + // 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 (dllname); + dllhandle = LoadLibrary (temp); #else - dllhandle = dlopen (dllname, RTLD_LAZY); + dllhandle = dlopen (temp, RTLD_LAZY | RTLD_GLOBAL); #endif + if (dllhandle) + break; + } + } + + // No DLL found if (! dllhandle) { - Con_Printf ("Can't load \"%s\".\n", dllname); + Con_Printf(" - failed.\n"); return false; } + Con_Printf(" - loaded.\n"); + // Get the function adresses for (func = fcts; func && func->name != NULL; func++) if (!(*func->funcvariable = (void *) Sys_GetProcAddress (dllhandle, func->name))) @@ -176,7 +130,6 @@ qboolean Sys_LoadLibrary (const char* dllname, dllhandle_t* handle, const dllfun } *handle = dllhandle; - Con_DPrintf("\"%s\" loaded.\n", dllname); return true; }