Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fix revision_data.h and boost/predef preprocessor macro conflict

Browse Source
This commit is contained in:
Shauren
2025-06-11 15:52:40 +02:00
parent 78dd65ad2e
commit 1f5f245c02
7 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/macros/ConfigureBaseTargets.cmake
View File

@@ -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="$<CONFIG>")
TRINITY_BUILD_TYPE="$<CONFIG>"
TRINITY_BUILD_HAS_DEBUG_INFO=$<CONFIG:Debug,RelWithDebInfo>)
# An interface library to make the target features available to other targets
add_library(trinity-feature-interface INTERFACE)

12
revision_data.h.in.cmake
View File

@@ -44,11 +44,11 @@
#define DATABASE_HOTFIXES_DATABASE "TDB_full_hotfixes_1115.25051_2025_05_31.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

12
src/common/GitRevision.cpp
View File

@@ -90,26 +90,26 @@ char const* GitRevision::GetHotfixesDatabase()
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;
}

28
src/server/bnetserver/bnetserver.rc
View File

@@ -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 Battle.net Server Daemon"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "FileVersion", TRINITY_FILEVERSION_STR
VALUE "InternalName", "bnetserver"
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
VALUE "LegalCopyright", TRINITY_LEGALCOPYRIGHT_STR
VALUE "OriginalFilename", "bnetserver.exe"
VALUE "ProductName", "TrinityCore Battle.net Server"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
VALUE "ProductVersion", TRINITY_PRODUCTVERSION_STR
END
END

2
src/server/game/Scripting/ScriptReloadMgr.cpp
View File

@@ -1114,7 +1114,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

2
src/server/scripts/ScriptLoader.cpp.in.cmake
View File

@@ -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

28
src/server/worldserver/worldserver.rc
View File

@@ -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