diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-09-03 12:06:16 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-09-03 19:56:38 +0200 |
| commit | fdd44f70dd0abe5a4b1052a97a004a10de336824 (patch) | |
| tree | a0a6afd34449f683848b10f2a97336a4c0134138 /src/server/scripts/ScriptLoader.cpp.in.cmake | |
| parent | 2592a08df667c6988a79dbc39be11346755b8d11 (diff) | |
Core/Misc: CompilerDefs/GitRevision improvements
* Removed INTEL as a separate platform (it does not belong there)
* Removed BORLAND from known compilers list (it was never supported)
* Simplified TRINITY_PLATFORM_WINDOWS detection (_WIN32 is always defined)
* Rename revision_data.h macros that begin with a underscore
* Added processor architecture to --version string
* Added Linux distribution name to .server debug
* Fixed some revision_data.h macros missing/wrong values when regenerated during compilation
* Removed manual adding of _WIN64 macro from cmake (it is predefined internally by compiler)
(cherry picked from commit e8740fb2e125b308493aeab49ddd7b0cc6a53c97)
# Conflicts:
# revision_data.h.in.cmake
Diffstat (limited to 'src/server/scripts/ScriptLoader.cpp.in.cmake')
| -rw-r--r-- | src/server/scripts/ScriptLoader.cpp.in.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/scripts/ScriptLoader.cpp.in.cmake b/src/server/scripts/ScriptLoader.cpp.in.cmake index de157c871f5..e4e92fa24b5 100644 --- a/src/server/scripts/ScriptLoader.cpp.in.cmake +++ b/src/server/scripts/ScriptLoader.cpp.in.cmake @@ -21,8 +21,6 @@ #cmakedefine TRINITY_IS_DYNAMIC_SCRIPTLOADER #include "Define.h" -#include <vector> -#include <string> @TRINITY_SCRIPTS_FORWARD_DECL@ #ifdef TRINITY_IS_DYNAMIC_SCRIPTLOADER @@ -33,7 +31,7 @@ extern "C" { /// Exposed in script modules to return the script module revision hash. TC_SCRIPT_API char const* GetScriptModuleRevisionHash() { - return _HASH; + return TRINITY_GIT_COMMIT_HASH; } /// Exposed in script module to return the name of the script module |