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/worldserver | |
| 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/worldserver')
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/server/worldserver/Master.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index d30d28f5b6f..e322ec31eaa 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -31,9 +31,6 @@ if( WIN32 ) endif() include_directories( - ${ACE_INCLUDE_DIR} - ${MYSQL_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/externals/gsoap ${CMAKE_SOURCE_DIR}/externals/sockets/include @@ -126,6 +123,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/worldserver/RemoteAccess ${CMAKE_SOURCE_DIR}/src/server/worldserver/TCSoap ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread + ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} ) set(worldserver_LINK_FLAGS "") diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 42d188895ac..ce2f442fa8f 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -24,9 +24,8 @@ #include <ace/Sig_Handler.h> -#include "revision.h" - #include "Common.h" +#include "SystemConfig.h" #include "SignalHandler.h" #include "World.h" #include "WorldRunnable.h" |