josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buildsystem: Ensure that we're on a Windows-platform if attempting to load Windows-specific includefiles

Browse Source 
(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:
click
2010-08-11 22:26:39 +02:00
parent 113d05b9d5
commit 293ed49eaa
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externals/libmpq/CMakeLists.txt
Vendored
+14 -6
View File
@@ -14,12 +14,20 @@ set(mpq_STAT_SRCS
${sources_mpq} ${sources_mpq}
) )
include_directories( if( UNIX )
${CMAKE_CURRENT_SOURCE_DIR} include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/win ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/externals/zlib ${CMAKE_SOURCE_DIR}/externals/zlib
${CMAKE_SOURCE_DIR}/externals/bzip2 ${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}) add_library(mpq STATIC ${mpq_STAT_SRCS})
src/tools/map_extractor/CMakeLists.txt
+16 -7
View File
@@ -11,13 +11,22 @@
file(GLOB_RECURSE sources *.cpp *.h) file(GLOB_RECURSE sources *.cpp *.h)
include_directories ( if( UNIX )
${CMAKE_SOURCE_DIR}/src/server/shared include_directories (
${CMAKE_SOURCE_DIR}/externals/libmpq ${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/externals/libmpq/win ${CMAKE_SOURCE_DIR}/externals/libmpq
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/loadlib ${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 add_executable(mapextractor
${sources} ${sources}
src/tools/vmap3_extractor/CMakeLists.txt
+10 -4
View File
@@ -20,10 +20,16 @@ add_definitions("-Wall")
add_definitions("-ggdb") add_definitions("-ggdb")
add_definitions("-O3") add_definitions("-O3")
include_directories( if( UNIX )
${CMAKE_SOURCE_DIR}/externals/libmpq include_directories(
${CMAKE_SOURCE_DIR}/externals/libmpq/win ${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}) add_executable(vmap3extractor ${sources})