From e1e443dbe14abb562b964ab4b1cc77f7cb74a581 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Mon, 3 Mar 2025 05:27:37 +0100 Subject: [PATCH] Fix CPU architectore in version strings on Windows BUILD_CPU has been replaced by D3_ARCH, which is also set by CMake on most platforms, except for Windows, there it's set in neo/sys/platform.h because CMake is not able to tell us what CPU platforms it's targeting (for other platforms we parse the output of gcc/clang's -dumpmachine option, but for MSVC that's not an option, of course) --- neo/d3xp/gamesys/SysCvar.cpp | 2 +- neo/framework/Common.cpp | 2 +- neo/game/gamesys/SysCvar.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neo/d3xp/gamesys/SysCvar.cpp b/neo/d3xp/gamesys/SysCvar.cpp index e1704cc2..01de76a4 100644 --- a/neo/d3xp/gamesys/SysCvar.cpp +++ b/neo/d3xp/gamesys/SysCvar.cpp @@ -65,7 +65,7 @@ const char *ui_skinArgs[] = { "skins/characters/player/marine_mp", "skins/char const char *ui_teamArgs[] = { "Red", "Blue", NULL }; struct gameVersion_s { - gameVersion_s( void ) { sprintf( string, "%s.%d%s %s-%s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_OS, BUILD_CPU, ID__DATE__, ID__TIME__ ); } + gameVersion_s( void ) { sprintf( string, "%s.%d%s %s-%s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_OS, D3_ARCH, ID__DATE__, ID__TIME__ ); } char string[256]; } gameVersion; diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp index 668b25ab..85affed3 100644 --- a/neo/framework/Common.cpp +++ b/neo/framework/Common.cpp @@ -82,7 +82,7 @@ typedef enum { #endif struct version_s { - version_s( void ) { sprintf( string, "%s.%d%s %s-%s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_OS, BUILD_CPU, ID__DATE__, ID__TIME__ ); } + version_s( void ) { sprintf( string, "%s.%d%s %s-%s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_OS, D3_ARCH, ID__DATE__, ID__TIME__ ); } char string[256]; } version; diff --git a/neo/game/gamesys/SysCvar.cpp b/neo/game/gamesys/SysCvar.cpp index 940c1d88..824d9c2e 100644 --- a/neo/game/gamesys/SysCvar.cpp +++ b/neo/game/gamesys/SysCvar.cpp @@ -55,7 +55,7 @@ const char *ui_skinArgs[] = { "skins/characters/player/marine_mp", "skins/char const char *ui_teamArgs[] = { "Red", "Blue", NULL }; struct gameVersion_s { - gameVersion_s( void ) { sprintf( string, "%s.%d%s %s-%s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_OS, BUILD_CPU, ID__DATE__, ID__TIME__ ); } + gameVersion_s( void ) { sprintf( string, "%s.%d%s %s-%s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_OS, D3_ARCH, ID__DATE__, ID__TIME__ ); } char string[256]; } gameVersion;