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/collision | |
| 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/collision')
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index 034daf09553..18d45074e98 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -21,9 +21,6 @@ set(collision_STAT_SRCS ) include_directories( - ${ACE_INCLUDE_DIR} - ${MYSQL_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/externals/g3dlite ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging @@ -34,6 +31,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/collision/Maps ${CMAKE_SOURCE_DIR}/src/server/collision/Models ${CMAKE_BINARY_DIR} + ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} ) add_library(collision STATIC ${collision_STAT_SRCS}) |