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})