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) --- revision_data.h.in.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'revision_data.h.in.cmake') 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 -- cgit v1.2.3