diff options
| author | click <none@none> | 2010-08-11 22:26:39 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-11 22:26:39 +0200 |
| commit | 293ed49eaa1246ed649fc25bf8aee11fe3c5777e (patch) | |
| tree | e663ed9cc0d6620be997e66ba689401d0e90e628 | |
| parent | 113d05b9d5f217a89e68f88bc1e9faa8a6ae660f (diff) | |
Buildsystem: Ensure that we're on a Windows-platform if attempting to load Windows-specific includefiles
(Why the hoot can't Microsoft use the same things as the rest of the world, and stick to standards!?)
--HG--
branch : trunk
| -rw-r--r-- | externals/libmpq/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | src/tools/vmap3_extractor/CMakeLists.txt | 14 |
3 files changed, 40 insertions, 17 deletions
diff --git a/externals/libmpq/CMakeLists.txt b/externals/libmpq/CMakeLists.txt index f665fa59b92..2a0da915171 100644 --- a/externals/libmpq/CMakeLists.txt +++ b/externals/libmpq/CMakeLists.txt @@ -14,12 +14,20 @@ set(mpq_STAT_SRCS ${sources_mpq} ) -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/win - ${CMAKE_SOURCE_DIR}/externals/zlib - ${CMAKE_SOURCE_DIR}/externals/bzip2 -) +if( UNIX ) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/externals/zlib + ${CMAKE_SOURCE_DIR}/externals/bzip2 + ) +elseif( WIN32 ) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/win + ${CMAKE_SOURCE_DIR}/externals/zlib + ${CMAKE_SOURCE_DIR}/externals/bzip2 + ) +endif() add_library(mpq STATIC ${mpq_STAT_SRCS}) diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index b50c2dbfd37..e1b4f6b403d 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -11,13 +11,22 @@ file(GLOB_RECURSE sources *.cpp *.h) -include_directories ( - ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/externals/libmpq - ${CMAKE_SOURCE_DIR}/externals/libmpq/win - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/loadlib -) +if( UNIX ) + include_directories ( + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/externals/libmpq + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/loadlib + ) +elseif( WIN32 ) + include_directories ( + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/externals/libmpq + ${CMAKE_SOURCE_DIR}/externals/libmpq/win + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/loadlib + ) +endif() add_executable(mapextractor ${sources} diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt index d1a08d09e34..2e36fe02448 100644 --- a/src/tools/vmap3_extractor/CMakeLists.txt +++ b/src/tools/vmap3_extractor/CMakeLists.txt @@ -20,10 +20,16 @@ add_definitions("-Wall") add_definitions("-ggdb") add_definitions("-O3") -include_directories( - ${CMAKE_SOURCE_DIR}/externals/libmpq - ${CMAKE_SOURCE_DIR}/externals/libmpq/win -) +if( UNIX ) + include_directories( + ${CMAKE_SOURCE_DIR}/externals/libmpq + ) +elseif( WIN32 ) + include_directories( + ${CMAKE_SOURCE_DIR}/externals/libmpq + ${CMAKE_SOURCE_DIR}/externals/libmpq/win + ) +endif() add_executable(vmap3extractor ${sources}) |