diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-22 18:19:53 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-22 19:17:08 +0100 |
| commit | 4a30800cf16d403a7c25d78388e2822aa396ac86 (patch) | |
| tree | 772753228bab7b0b4ba47e89580ed86de0ca098f /src/CMakeLists.txt | |
| parent | 1406464f0ce0b804298e2ee034bdd8bc7856e0dc (diff) | |
| download | colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.gz colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.bz2 colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.zip | |
Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues
* disabled desktop subdir for MSYS
* disabled building CBot_console for now
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc181f2..3d6908d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,22 +12,18 @@ add_subdirectory(tools) add_subdirectory(po) -add_subdirectory(desktop) +if(${DESKTOP}) + add_subdirectory(desktop) +endif() # Optional libraries set(OPTIONAL_LIBS "") +set(OPTIONAL_INCLUDES "") if (${OPENAL_SOUND}) - if (${PLATFORM_WINDOWS}) - set(OPTIONAL_LIBS - OpenAL32 - ) - else() - set(OPTIONAL_LIBS - openal - ) - endif() + set(OPTIONAL_LIBS ${OPENAL_LIBRARY}) + set(OPTIONAL_INCLUDES ${OPENAL_INCLUDE_DIR}) endif() # Additional libraries per platform @@ -196,8 +192,8 @@ ${OPENGL_LIBRARY} ${PNG_LIBRARIES} ${GLEW_LIBRARY} ${Boost_LIBRARIES} -${OPTIONAL_LIBS} ${LIBSNDFILE_LIBRARY} +${OPTIONAL_LIBS} ${PLATFORM_LIBS} ) @@ -217,8 +213,8 @@ ${SDLTTF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${Boost_INCLUDE_DIRS} -${OPTIONAL_INCLUDE_DIRS} ${LIBSNDFILE_INCLUDE_DIR} +${OPTIONAL_INCLUDE_DIRS} ) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot) |