From b4bef54b7a6be1b25d670c3f630b1c4370da7757 Mon Sep 17 00:00:00 2001 From: click Date: Mon, 16 Aug 2010 09:51:37 +0200 Subject: 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 --- src/server/scripts/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 9a198774d90..a5a36263ba2 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -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} ) -- cgit v1.2.3