From d03e90ef43b24f5fc2078fb8939b5f89d458c558 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 11 Jun 2025 15:52:40 +0200 Subject: Core/Misc: Fix revision_data.h and boost/predef preprocessor macro conflict (cherry picked from commit 1f5f245c02e92b967abfcd74858669be98a49333) --- cmake/macros/ConfigureBaseTargets.cmake | 3 ++- revision_data.h.in.cmake | 12 ++++++------ src/common/GitRevision.cpp | 12 ++++++------ src/server/authserver/authserver.rc | 28 ++++++++++++--------------- src/server/game/Scripting/ScriptReloadMgr.cpp | 2 +- src/server/scripts/ScriptLoader.cpp.in.cmake | 2 +- src/server/worldserver/worldserver.rc | 28 ++++++++++++--------------- 7 files changed, 40 insertions(+), 47 deletions(-) diff --git a/cmake/macros/ConfigureBaseTargets.cmake b/cmake/macros/ConfigureBaseTargets.cmake index 77a66d085b2..19d11d27bd5 100644 --- a/cmake/macros/ConfigureBaseTargets.cmake +++ b/cmake/macros/ConfigureBaseTargets.cmake @@ -18,7 +18,8 @@ set(CMAKE_CXX_STANDARD 20) # Set build-directive (used in core to tell which buildtype we used) target_compile_definitions(trinity-compile-option-interface INTERFACE - _BUILD_DIRECTIVE="$") + TRINITY_BUILD_TYPE="$" + TRINITY_BUILD_HAS_DEBUG_INFO=$) # An interface library to make the target features available to other targets add_library(trinity-feature-interface INTERFACE) diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake index f3b414d4554..1a6abd976e8 100644 --- a/revision_data.h.in.cmake +++ b/revision_data.h.in.cmake @@ -43,11 +43,11 @@ #define DATABASE_FULL_DATABASE "TDB_full_world_335.24111_2024_11_22.sql" // Windows resource defines -#define VER_COMPANYNAME_STR "TrinityCore Developers" -#define VER_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore" -#define VER_FILEVERSION 0,0,0 -#define VER_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)" -#define VER_PRODUCTVERSION VER_FILEVERSION -#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR +#define TRINITY_COMPANYNAME_STR "TrinityCore Developers" +#define TRINITY_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore" +#define TRINITY_FILEVERSION 0,0,0 +#define TRINITY_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)" +#define TRINITY_PRODUCTVERSION TRINITY_FILEVERSION +#define TRINITY_PRODUCTVERSION_STR TRINITY_FILEVERSION_STR #endif // TRINITYCORE_REVISION_DATA_H diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp index 2c431a603f7..1060c93e275 100644 --- a/src/common/GitRevision.cpp +++ b/src/common/GitRevision.cpp @@ -81,26 +81,26 @@ char const* GitRevision::GetFullDatabase() char const* GitRevision::GetFullVersion() { - return "TrinityCore rev. " VER_PRODUCTVERSION_STR - " (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR ", " _BUILD_DIRECTIVE ", " TRINITY_LINKAGE_TYPE_STR ")"; + return "TrinityCore rev. " TRINITY_PRODUCTVERSION_STR + " (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR ", " TRINITY_BUILD_TYPE ", " TRINITY_LINKAGE_TYPE_STR ")"; } char const* GitRevision::GetCompanyNameStr() { - return VER_COMPANYNAME_STR; + return TRINITY_COMPANYNAME_STR; } char const* GitRevision::GetLegalCopyrightStr() { - return VER_LEGALCOPYRIGHT_STR; + return TRINITY_LEGALCOPYRIGHT_STR; } char const* GitRevision::GetFileVersionStr() { - return VER_FILEVERSION_STR; + return TRINITY_FILEVERSION_STR; } char const* GitRevision::GetProductVersionStr() { - return VER_PRODUCTVERSION_STR; + return TRINITY_PRODUCTVERSION_STR; } diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc index 6a80c16d48b..26d87973b33 100644 --- a/src/server/authserver/authserver.rc +++ b/src/server/authserver/authserver.rc @@ -51,21 +51,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT // Version // -VS_VERSION_INFO VERSIONINFO -FILEVERSION VER_FILEVERSION -PRODUCTVERSION VER_PRODUCTVERSION - -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - -#ifndef _DEBUG - FILEFLAGS 0 +#if TRINITY_BUILD_HAS_DEBUG_INFO == 1 +#define TRINITY_DEBUG VS_FF_DEBUG #else - #define VER_PRERELEASE VS_FF_PRERELEASE - #define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD - #define VER_DEBUG 0 - FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG) +#define TRINITY_DEBUG 0 #endif +VS_VERSION_INFO VERSIONINFO +FILEVERSION TRINITY_FILEVERSION +PRODUCTVERSION TRINITY_PRODUCTVERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS (VS_FF_PRERELEASE | TRINITY_DEBUG) FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP @@ -74,14 +70,14 @@ BEGIN BEGIN BLOCK "080004b0" BEGIN - VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "CompanyName", TRINITY_COMPANYNAME_STR VALUE "FileDescription", "TrinityCore Authentication Server Daemon" - VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "FileVersion", TRINITY_FILEVERSION_STR VALUE "InternalName", "authserver" - VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR + VALUE "LegalCopyright", TRINITY_LEGALCOPYRIGHT_STR VALUE "OriginalFilename", "authserver.exe" VALUE "ProductName", "TrinityCore Authentication Server" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "ProductVersion", TRINITY_PRODUCTVERSION_STR END END diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 3a7e8326564..c55822b9811 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -1119,7 +1119,7 @@ private: if (itr != _known_modules_build_directives.end()) return itr->second; else // If no build directive of the module was found use the one from the game library - return _BUILD_DIRECTIVE; + return TRINITY_BUILD_TYPE; }(); // Initiate the new build job diff --git a/src/server/scripts/ScriptLoader.cpp.in.cmake b/src/server/scripts/ScriptLoader.cpp.in.cmake index e4e92fa24b5..fe45bb90f2c 100644 --- a/src/server/scripts/ScriptLoader.cpp.in.cmake +++ b/src/server/scripts/ScriptLoader.cpp.in.cmake @@ -54,7 +54,7 @@ TC_SCRIPT_API void AddScripts() /// Exposed in script modules to get the build directive of the module. TC_SCRIPT_API char const* GetBuildDirective() { - return _BUILD_DIRECTIVE; + return TRINITY_BUILD_TYPE; } #ifdef TRINITY_IS_DYNAMIC_SCRIPTLOADER diff --git a/src/server/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc index dcac6708de3..00de6b92469 100644 --- a/src/server/worldserver/worldserver.rc +++ b/src/server/worldserver/worldserver.rc @@ -51,21 +51,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT // Version // -VS_VERSION_INFO VERSIONINFO -FILEVERSION VER_FILEVERSION -PRODUCTVERSION VER_PRODUCTVERSION - -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - -#ifndef _DEBUG - FILEFLAGS 0 +#if TRINITY_BUILD_HAS_DEBUG_INFO == 1 +#define TRINITY_DEBUG VS_FF_DEBUG #else - #define VER_PRERELEASE VS_FF_PRERELEASE - #define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD - #define VER_DEBUG 0 - FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG) +#define TRINITY_DEBUG 0 #endif +VS_VERSION_INFO VERSIONINFO +FILEVERSION TRINITY_FILEVERSION +PRODUCTVERSION TRINITY_PRODUCTVERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS (VS_FF_PRERELEASE | TRINITY_DEBUG) FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP @@ -74,14 +70,14 @@ BEGIN BEGIN BLOCK "080004b0" BEGIN - VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "CompanyName", TRINITY_COMPANYNAME_STR VALUE "FileDescription", "TrinityCore World Server Daemon" - VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "FileVersion", TRINITY_FILEVERSION_STR VALUE "InternalName", "worldserver" - VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR + VALUE "LegalCopyright", TRINITY_LEGALCOPYRIGHT_STR VALUE "OriginalFilename", "worldserver.exe" VALUE "ProductName", "TrinityCore World Server" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "ProductVersion", TRINITY_PRODUCTVERSION_STR END END -- cgit v1.2.3