diff options
| author | erihel <erihel@gmail.com> | 2013-01-09 23:21:37 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-01-09 23:21:37 +0100 |
| commit | 08578c401565c200a205317327c7b0c6f4bb65e1 (patch) | |
| tree | 34185d4dbd821bb759b514c3b07d6f2863be4147 /src/CMakeLists.txt | |
| parent | 983373f150f6b122e92f054fa1b8e1af60b21197 (diff) | |
| parent | cf722462438707871e53bd96235b767e77dce6d3 (diff) | |
| download | colobot-08578c401565c200a205317327c7b0c6f4bb65e1.tar.gz colobot-08578c401565c200a205317327c7b0c6f4bb65e1.tar.bz2 colobot-08578c401565c200a205317327c7b0c6f4bb65e1.zip | |
Merge branch 'dev' of github:colobot/colobot into dev
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c00d347..a90b735 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,13 @@ -# CBot library is built separately +# Compile flags as defined in global CMakeLists +set(CMAKE_CXX_FLAGS ${COLOBOT_CXX_FLAGS}) +set(CMAKE_CXX_FLAGS_RELEASE ${COLOBOT_CXX_FLAGS_RELEASE}) +set(CMAKE_CXX_FLAGS_DEBUG ${COLOBOT_CXX_FLAGS_DEBUG}) + + +# Subdirectories + add_subdirectory(CBot) -# Tools directory is built separately add_subdirectory(tools) add_subdirectory(po) @@ -196,10 +202,16 @@ ${OPTIONAL_LIBS} ${PLATFORM_LIBS} ) +# Local include_directories( . .. ${CMAKE_CURRENT_BINARY_DIR} +) + +# System +include_directories( +SYSTEM ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} |