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

5 files changed, 32 insertions, 40 deletions

diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp
index 9b56f65a004..bf04e650f75 100644
--- a/src/common/GitRevision.cpp
+++ b/src/common/GitRevision.cpp
@@ -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;
 }
diff --git a/src/server/bnetserver/bnetserver.rc b/src/server/bnetserver/bnetserver.rc
index 89316fb94e0..910132ffd16 100644
--- a/src/server/bnetserver/bnetserver.rc
+++ b/src/server/bnetserver/bnetserver.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 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
 
diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp
index d61dd8a318a..d7e40c53b8d 100644
--- a/src/server/game/Scripting/ScriptReloadMgr.cpp
+++ b/src/server/game/Scripting/ScriptReloadMgr.cpp
@@ -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
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