From 293ed49eaa1246ed649fc25bf8aee11fe3c5777e Mon Sep 17 00:00:00 2001 From: click Date: Wed, 11 Aug 2010 22:26:39 +0200 Subject: 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 --- src/tools/map_extractor/CMakeLists.txt | 23 ++++++++++++++++------- src/tools/vmap3_extractor/CMakeLists.txt | 14 ++++++++++---- 2 files changed, 26 insertions(+), 11 deletions(-) (limited to 'src') 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}) -- cgit v1.2.3