blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-02-22 19:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactored BUILDSTRING into OS_STRING and COMPILETYPE_STRING

Browse source
This commit is contained in:
Knightmare66 2020-05-06 14:49:40 -04:00
parent 93dc5e0534
commit 62c5281baa
4 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/cl_main.c
View file

@ -1858,8 +1858,8 @@ void CL_AdvertiseVersion (void)
{ {
char adBuf[128]; char adBuf[128];
Com_sprintf (adBuf, sizeof(adBuf), "say \"KMQuake2 %4.2f %s %s %s [www.markshan.com/knightmare]\"\n", Com_sprintf (adBuf, sizeof(adBuf), "say \"KMQuake2 %4.2f %s %s %s %s [www.markshan.com/knightmare]\"\n",
VERSION, CPUSTRING, BUILDSTRING, __DATE__); VERSION, CPUSTRING, OS_STRING, COMPILETYPE_STRING, __DATE__);
Cbuf_AddText (adBuf); Cbuf_AddText (adBuf);
cls.lastAdvertiseTime = cls.realtime; cls.lastAdvertiseTime = cls.realtime;
cls.advertiseTime = 0; cls.advertiseTime = 0;

2
qcommon/common.c
View file

@ -1692,7 +1692,7 @@ void Qcommon_Init (int argc, char **argv)
sv_engine_version = Cvar_Get ("sv_engine_version", va("%4.2f",VERSION), CVAR_SERVERINFO | CVAR_NOSET | CVAR_LATCH); sv_engine_version = Cvar_Get ("sv_engine_version", va("%4.2f",VERSION), CVAR_SERVERINFO | CVAR_NOSET | CVAR_LATCH);
// end Knightmare // end Knightmare
s = va("%4.2f %s %s %s", VERSION, CPUSTRING, __DATE__, BUILDSTRING); s = va("KMQ2 %4.2f %s %s %s %s", VERSION, CPUSTRING, OS_STRING, COMPILETYPE_STRING, __DATE__);
Cvar_Get ("version", s, CVAR_SERVERINFO|CVAR_NOSET); Cvar_Get ("version", s, CVAR_SERVERINFO|CVAR_NOSET);
if (dedicated->value) if (dedicated->value)

56
qcommon/qcommon.h
View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../game/q_shared.h" #include "../game/q_shared.h"
#define VERSION 0.20 //was 3.21 #define VERSION 0.20 // was 3.21
#define BASEDIRNAME "baseq2" #define BASEDIRNAME "baseq2"
@ -34,47 +34,79 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef WIN32 #ifdef WIN32
#ifdef NDEBUG #if defined (_M_X64) || defined (_M_AMD64) || defined (__x86_64__)
#define BUILDSTRING "Win32 RELEASE" #define CPUSTRING "x64"
#else #define OS_STRING "Win64"
#define BUILDSTRING "Win32 DEBUG" #define STOCK_Q2_GAME_LIBRARY_NAME "gamex86.dll"
#endif #define KMQ2_GAME_LIBRARY_NAME "kmq2gamex64.dll"
//#ifdef _M_IX86
#ifdef _M_IX86 #elif defined(_M_IX86) || defined (__i386__) // [Slipyx] mingw case
#define CPUSTRING "x86" #define CPUSTRING "x86"
#define OS_STRING "Win32"
#define STOCK_Q2_GAME_LIBRARY_NAME "gamex86.dll"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gamex86.dll"
#elif defined _M_ALPHA #elif defined _M_ALPHA
#define CPUSTRING "AXP" #define CPUSTRING "AXP"
#define OS_STRING "Win32"
#define STOCK_Q2_GAME_LIBRARY_NAME "gameaxp.dll"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gameaxp.dll"
#endif #endif
#elif defined __linux__ #elif defined __linux__
#define BUILDSTRING "Linux" #define OS_STRING "Linux"
#ifdef __i386__ #if defined (_M_X64) || defined (_M_AMD64) || defined (__x86_64__)
#define CPUSTRING "AMD64"
#define STOCK_Q2_GAME_LIBRARY_NAME "gamei386.so"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gameamd64.so"
#elif defined __i386__
#define CPUSTRING "i386" #define CPUSTRING "i386"
#define STOCK_Q2_GAME_LIBRARY_NAME "gamei386.so"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gamei386.so"
#elif defined __alpha__ #elif defined __alpha__
#define CPUSTRING "axp" #define CPUSTRING "axp"
#define STOCK_Q2_GAME_LIBRARY_NAME "gameaxp.so"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gameaxp.so"
#else #else
#define CPUSTRING "Unknown" #define CPUSTRING "Unknown"
#endif #endif
#elif defined __sun__ #elif defined __sun__
#define BUILDSTRING "Solaris" #define OS_STRING "Solaris"
#ifdef __i386__ #ifdef __i386__
#define CPUSTRING "i386" #define CPUSTRING "i386"
#define STOCK_Q2_GAME_LIBRARY_NAME "gamei386.so"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gamei386.so"
#else #else
#define CPUSTRING "sparc" #define CPUSTRING "sparc"
#define STOCK_Q2_GAME_LIBRARY_NAME "gamesparc.so"
#define KMQ2_GAME_LIBRARY_NAME "kmq2gamesparc.so"
#endif #endif
#elif defined(__APPLE__) || defined(MACOSX)
#define OS_STRING "MacOS"
#define STOCK_Q2_GAME_LIBRARY_NAME "GameMac.q2plug"
#define KMQ2_GAME_LIBRARY_NAME "GameMac.kmq2plug"
#else // !WIN32 #else // !WIN32
#define BUILDSTRING "NON-WIN32" #define OS_STRING "NON-WIN32"
#define CPUSTRING "NON-WIN32" #define CPUSTRING "NON-WIN32"
#endif #endif
#ifdef NDEBUG
#define COMPILETYPE_STRING "RELEASE"
#else
#define COMPILETYPE_STRING "DEBUG"
#endif // NDEBUG
//============================================================================ //============================================================================
typedef struct sizebuf_s typedef struct sizebuf_s

2
win32/sys_win.c
View file

@ -1914,7 +1914,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
#ifdef NEW_DED_CONSOLE // init debug console #ifdef NEW_DED_CONSOLE // init debug console
Sys_InitDedConsole (); Sys_InitDedConsole ();
Com_Printf("KMQ2 %4.2f %s %s %s\n", VERSION, CPUSTRING, BUILDSTRING, __DATE__); Com_Printf("KMQ2 %4.2f %s %s %s %s\n", VERSION, CPUSTRING, OS_STRING, COMPILETYPE_STRING, __DATE__);
#endif #endif
// Knightmare- scan for cd command line option // Knightmare- scan for cd command line option