diff options
| author | StormBytePP <stormbyte@gmail.com> | 2015-08-16 16:56:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-08-16 17:50:40 +0200 |
| commit | 6a9fc63e412adf7074c2850320cddf007edc3b28 (patch) | |
| tree | 1fd539b128874dba459afe5f42ab94b84bab5073 /src/server/bnetserver | |
| parent | b9106ee000f3c4955324739117eba86b8e538a3c (diff) | |
Core/Build: Removed obsolete SystemConfig.h and made genrev be part of shared library, which allows cache hits to happen more likely
(cherry picked from commit 94f69fb1bcef103392ca27074ebb31ef2ebd27fb)
Diffstat (limited to 'src/server/bnetserver')
| -rw-r--r-- | src/server/bnetserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/bnetserver/Main.cpp | 6 | ||||
| -rw-r--r-- | src/server/bnetserver/bnetserver.rc | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt index e80e99cdda7..93a21406099 100644 --- a/src/server/bnetserver/CMakeLists.txt +++ b/src/server/bnetserver/CMakeLists.txt @@ -80,8 +80,6 @@ add_executable(bnetserver ${bnetserver_PCH_SRC} ) -add_dependencies(bnetserver revision.h) - if( NOT WIN32 ) set_target_properties(bnetserver PROPERTIES COMPILE_DEFINITIONS _TRINITY_BNET_CONFIG="${CONF_DIR}/bnetserver.conf" diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp index d7d9951f233..0aa5f748635 100644 --- a/src/server/bnetserver/Main.cpp +++ b/src/server/bnetserver/Main.cpp @@ -34,7 +34,7 @@ #include "AppenderDB.h" #include "ProcessPriority.h" #include "RealmList.h" -#include "SystemConfig.h" +#include "Revision.h" #include "Util.h" #include "ZmqContext.h" #include "DatabaseLoader.h" @@ -108,7 +108,7 @@ int main(int argc, char** argv) sLog->RegisterAppender<AppenderDB>(); sLog->Initialize(nullptr); - TC_LOG_INFO("server.bnetserver", "%s (bnetserver)", _FULLVERSION); + TC_LOG_INFO("server.bnetserver", "%s (bnetserver)", Revision::GetFullVersion()); TC_LOG_INFO("server.bnetserver", "<Ctrl-C> to stop.\n"); TC_LOG_INFO("server.bnetserver", "Using configuration file %s.", configFile.c_str()); TC_LOG_INFO("server.bnetserver", "Using SSL version: %s (library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION)); @@ -307,7 +307,7 @@ variables_map GetConsoleArguments(int argc, char** argv, std::string& configFile } else if (variablesMap.count("version")) { - std::cout << _FULLVERSION << "\n"; + std::cout << Revision::GetFullVersion() << "\n"; } return variablesMap; diff --git a/src/server/bnetserver/bnetserver.rc b/src/server/bnetserver/bnetserver.rc index 434d898e647..6b42665ae0f 100644 --- a/src/server/bnetserver/bnetserver.rc +++ b/src/server/bnetserver/bnetserver.rc @@ -17,7 +17,7 @@ */ #include "resource.h" -#include "revision.h" +#include "revision_data.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// |