diff options
| author | click <none@none> | 2010-08-16 09:51:37 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-16 09:51:37 +0200 |
| commit | b4bef54b7a6be1b25d670c3f630b1c4370da7757 (patch) | |
| tree | 8cd73603c83a6de93ebb57160a3a7ac5c26359aa /src/server/authserver | |
| parent | ced726264653bed9a41a7725465a9292786dafc4 (diff) | |
Fix Windows-build (YES, IT COMPILES!) - partial revert of revision a9386a2655
- Use minihack on ACE to avoid using config.h on Windows platforms
- Put include-locations for ACE in AFTER everything else (for later use)
An insane thanks to paradox for being patient with testing changes and swapouts
--HG--
branch : trunk
Diffstat (limited to 'src/server/authserver')
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/server/authserver/Main.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index f3bfcdb78a1..17e5fd08450 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -31,9 +31,6 @@ set(authserver_SRCS endif() include_directories( - ${ACE_INCLUDE_DIR} - ${MYSQL_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database @@ -46,6 +43,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms ${CMAKE_SOURCE_DIR}/src/server/authserver/Server + ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} ) set(authserver_LINK_FLAGS "") diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index db597055d0b..88a98cd6cdb 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -22,14 +22,13 @@ /// @{ /// \file -#include "revision.h" - #include "Common.h" #include "Database/DatabaseEnv.h" #include "Database/PreparedStatements.h" #include "Configuration/Config.h" #include "Log.h" +#include "SystemConfig.h" #include "Util.h" #include "SignalHandler.h" #include "RealmList.h" |
