diff options
author | Shauren <shauren.trinity@gmail.com> | 2025-06-11 15:52:40 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2025-06-11 15:52:40 +0200 |
commit | 1f5f245c02e92b967abfcd74858669be98a49333 (patch) | |
tree | 08b45de6ef363000b0f3b4845ec11c3401772a0a /src/common/GitRevision.cpp | |
parent | 78dd65ad2e57b212c38f313be92e477fcd8d68bd (diff) |
Core/Misc: Fix revision_data.h and boost/predef preprocessor macro conflict
Diffstat (limited to 'src/common/GitRevision.cpp')
-rw-r--r-- | src/common/GitRevision.cpp | 12 |
1 files changed, 6 insertions, 6 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; } |