diff options
| author | Naios <naios-dev@live.de> | 2016-02-22 16:25:47 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-02-22 16:25:47 +0100 |
| commit | b5369b7d874c337f49051f79dba9508f21a218de (patch) | |
| tree | a71b3978b6df3769cc654b81f7f70ec1835077a2 /src/server/authserver | |
| parent | f2233f5d1426d12d16178eced900c1be9666983f (diff) | |
Core/Common: Add a generic config helper to access built-in overwriteable paths.
* Adds CMAKE_COMMAND and CMAKE_BINARY_DIR to revision_data.h
* Move the source and mysql exe path handling out of the DBUpdater.
* Make some Config methods const for correctness.
* Remove C & CXX flags from revision_data.h
(was unused and didn't capture all cxx vars)
* Reorder the link order to prevent `ld` from ignoring the file
* Ref #15671
(cherry picked from commit 719159e2074ac2d0902c70bdd3c7a39e0d311bbe)
Diffstat (limited to 'src/server/authserver')
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/server/authserver/authserver.conf.dist | 40 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index c11deec39bb..d87847d6740 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -79,10 +79,10 @@ if( NOT WIN32 ) endif() target_link_libraries(authserver - common shared - format database + common + format ${MYSQL_LIBRARY} ${OPENSSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist index 82c3cd47148..a97d75b3f57 100644 --- a/src/server/authserver/authserver.conf.dist +++ b/src/server/authserver/authserver.conf.dist @@ -138,6 +138,26 @@ WrongPass.Logging = 0 BanExpiryCheckInterval = 60 # +# SourceDirectory +# Description: The path to your TrinityCore source directory. +# If the path is left empty, the built-in CMAKE_SOURCE_DIR is used. +# Example: "../TrinityCore" +# Default: "" + +SourceDirectory = "" + +# +# MySQLExecutable +# Description: The path to your mysql cli binary. +# If the path is left empty, built-in path from cmake is used. +# Example: "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe" +# "mysql.exe" +# "/usr/bin/mysql" +# Default: "" + +MySQLExecutable = "" + +# ################################################################################################### ################################################################################################### @@ -181,26 +201,6 @@ LoginDatabase.WorkerThreads = 1 Updates.EnableDatabases = 0 # -# Updates.SourcePath -# Description: The path to your TrinityCore source directory. -# If the path is left empty, built-in CMAKE_SOURCE_DIR is used. -# Example: "../TrinityCore" -# Default: "" - -Updates.SourcePath = "" - -# -# Updates.MySqlCLIPath -# Description: The path to your mysql cli binary. -# If the path is left empty, built-in path from cmake is used. -# Example: "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe" -# "mysql.exe" -# "/usr/bin/mysql" -# Default: "" - -Updates.MySqlCLIPath = "" - -# # Updates.AutoSetup # Description: Auto populate empty databases. # Default: 1 - (Enabled) |
