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
This commit is contained in:
click
2010-08-16 09:51:37 +02:00
parent ced7262646
commit b4bef54b7a
17 changed files with 93 additions and 72 deletions
+1 -1
View File
@@ -51,7 +51,6 @@ endif()
message("-- Added Script Library to SCRIPTS lib")
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/externals/mersennetwister
${CMAKE_SOURCE_DIR}/externals/zlib
@@ -136,6 +135,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/game/Weather
${CMAKE_SOURCE_DIR}/src/server/game/World
${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
)