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:
@@ -96,9 +96,6 @@ if(MSVC)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
${ACE_INCLUDE_DIR}
|
||||
${MYSQL_INCLUDE_DIR}
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/externals/mersennetwister
|
||||
${CMAKE_SOURCE_DIR}/externals/zlib
|
||||
@@ -185,6 +182,9 @@ 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}
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
add_library(game STATIC ${game_STAT_SRCS})
|
||||
|
||||
Reference in New Issue
Block a user