diff options
| author | Subv <subv2112@gmail.com> | 2014-07-13 15:55:46 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-07-13 15:55:46 -0500 |
| commit | a4f7211aedc767878fa2234c592ebf83c2e3fa10 (patch) | |
| tree | 4d97fc21c137a30e9e472540a6ed4eb8238270a6 /src/server/worldserver/Main.cpp | |
| parent | 87f830ca89d4ab448a3dcf25f0475575cfed247b (diff) | |
Fixed the worldserver not using the path to the config file as defined in cmake
Diffstat (limited to 'src/server/worldserver/Main.cpp')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 0e7e7064031..967a31579fa 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -45,7 +45,10 @@ #include "SystemConfig.h" #include "WorldSocket.h" -#define TRINITY_CORE_CONFIG "worldserver.conf" +#ifndef _TRINITY_CORE_CONFIG + #define _TRINITY_CORE_CONFIG "worldserver.conf" +#endif + #define WORLD_SLEEP_CONST 50 #ifdef _WIN32 @@ -86,7 +89,7 @@ void ClearOnlineAccounts(); extern int main(int argc, char** argv) { ///- Command line parsing to get the configuration file name - char const* cfg_file = TRINITY_CORE_CONFIG; + char const* cfg_file = _TRINITY_CORE_CONFIG; int c = 1; while (c < argc) { |