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
This commit is contained in:
@@ -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}
|
||||
|
||||
@@ -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})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user