timedemo now also prints min/avg/max fps

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 719bce792de45867ada0b19aee1bc1c788c5ed82..881c560e9fdb7829156d1630f2d96625c7ae7f2d 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -43,17 +43,14 @@ static char qfont_table[256] = {
        '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', 
+       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
        'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
-#ifdef WIN32
-extern HANDLE hinput, houtput;
-#endif
 
 #define MAX_PRINT_MSG  16384
-void Sys_Printf (char *fmt, ...)
+void Sys_Printf (const char *fmt, ...)
 {
        va_list         argptr;
        char            start[MAX_PRINT_MSG];   // String we started with
@@ -64,22 +61,15 @@ void Sys_Printf (char *fmt, ...)
        struct tm       *local = NULL;
 
        unsigned char           *p;
-#ifdef WIN32
-       DWORD           dummy;
-#endif
 
        va_start (argptr, fmt);
-#ifdef HAVE_VSNPRINTF
        vsnprintf (start, sizeof(start), fmt, argptr);
-#else
-       vsprintf (start, fmt, argptr);
-#endif
        va_end (argptr);
 
        if (sys_nostdout)
                return;
 
-       if (timestamps.value)
+       if (timestamps.integer)
        {
                mytime = time (NULL);
                local = localtime (&mytime);
@@ -94,32 +84,80 @@ void Sys_Printf (char *fmt, ...)
        final[MAX_PRINT_MSG - 1] = 0;
        for (p = (unsigned char *) final;*p; p++)
                *p = qfont_table[*p];
-#ifdef WIN32
-       if (cls.state == ca_dedicated)
-               WriteFile(houtput, final, strlen (final), &dummy, NULL);
-#else
-       printf("%s", final);
-#endif
-//     for (p = (unsigned char *) final; *p; p++)
-//             putc (qfont_table[*p], stdout);
-//#ifndef WIN32
-//     fflush (stdout);
-//#endif
+       Sys_Print(final);
 }
 
-void Sys_Shared_Init(void)
+
+char engineversion[128];
+
+void Sys_Shared_EarlyInit(void)
 {
+       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";
+#endif
+       snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
+
        if (COM_CheckParm("-nostdout"))
                sys_nostdout = 1;
        else
-       {
-#if defined(__linux__)
-               fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-               printf ("DarkPlaces Linux   GL %.2f build %3i", (float) VERSION, buildnumber);
-#elif defined(WIN32)
-               printf ("DarkPlaces Windows GL %.2f build %3i", (float) VERSION, buildnumber);
+               Con_Printf("%s\n", engineversion);
+}
+
+void Sys_Shared_LateInit(void)
+{
+}
+
+/*
+===============================================================================
+
+DLL MANAGEMENT
+
+===============================================================================
+*/
+
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
+
+dllhandle_t Sys_LoadLibrary (const char* name)
+{
+#ifdef WIN32
+       return LoadLibrary (name);
 #else
-               printf ("DarkPlaces Unknown GL %.2f build %3i", (float) VERSION, buildnumber);
+       return dlopen (name, RTLD_LAZY);
 #endif
-       }
 }
+
+void Sys_UnloadLibrary (dllhandle_t handle)
+{
+#ifdef WIN32
+       FreeLibrary (handle);
+#else
+       dlclose (handle);
+#endif
+}
+
+void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
+{
+#ifdef WIN32
+       return (void *)GetProcAddress (handle, name);
+#else
+       return (void *)dlsym (handle, name);
+#endif
+}
+