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

externals/libmpq/CMakeLists.txt

@@ -14,12 +14,20 @@ set(mpq_STAT_SRCS
   ${sources_mpq}
 )
 
+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})
 

src/tools/map_extractor/CMakeLists.txt

@@ -11,6 +11,14 @@
 
 file(GLOB_RECURSE sources *.cpp *.h)
 
+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
@@ -18,6 +26,7 @@ include_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
   )
+endif()
 
 add_executable(mapextractor
   ${sources}

src/tools/vmap3_extractor/CMakeLists.txt

@@ -20,10 +20,16 @@ add_definitions("-Wall")
 add_definitions("-ggdb")
 add_definitions("-O3")
 
+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})