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

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

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

28
src/server/authserver/authserver.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 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

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

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

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