diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
commit | 89a3f586a224328b430ba2483ce5c12b33709c6a (patch) | |
tree | 691e1da1e297f7ea9045be5454747ca454680cb2 /src/CMakeLists.txt | |
parent | c9335534d6bc7a59dbabf6976d41fd1e5edc8ab3 (diff) | |
parent | 1d42c71645548ae86b438c84898a07b539f262ac (diff) | |
download | colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.gz colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.bz2 colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.zip |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eaf404a..abd4a95 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,6 +4,10 @@ add_subdirectory(CBot) # Tools directory is built separately add_subdirectory(tools) +add_subdirectory(po) + +add_subdirectory(desktop) + # Tests if(${TESTS}) add_subdirectory(common/test) @@ -25,9 +29,24 @@ endif() # Additional libraries per platform set(PLATFORM_LIBS "") +set(OPENAL_LIBS "") + +if (${OPENAL_SOUND}) + if (${MXE}) + set(OPENAL_LIBS + ${CMAKE_FIND_ROOT_PATH}/lib/libOpenAL32.a + ${CMAKE_FIND_ROOT_PATH}/lib/libalut.a + ) + else() + set(OPENAL_LIBS + openal + alut + ) + endif() +endif() if (${MXE}) # MXE requires special treatment - set(PLATFORM_LIBS ${MXE_LIBS}) + set(PLATFORM_LIBS ${MXE_LIBS}) elseif (${PLATFORM_WINDOWS}) # because it isn't included in standard linking libraries set(PLATFORM_LIBS "-lintl") @@ -40,6 +59,15 @@ endif() # Configure file configure_file(common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common/config.h) +set(OPENAL_SRC "") + +if (${OPENAL_SOUND}) + set(OPENAL_SRC + sound/oalsound/alsound.cpp + sound/oalsound/buffer.cpp + sound/oalsound/channel.cpp + ) +endif() # Source files set(SOURCES @@ -159,10 +187,10 @@ ui/slider.cpp ui/studio.cpp ui/target.cpp ui/window.cpp -plugins/pluginmanager.cpp -plugins/pluginloader.cpp +${OPENAL_SRC} ) + set(LIBS ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} @@ -172,8 +200,8 @@ ${PNG_LIBRARIES} ${OPTIONAL_LIBS} ${PLATFORM_LIBS} ${Boost_LIBRARIES} -ltdl CBot +${OPENAL_LIBS} ) include_directories( @@ -194,4 +222,5 @@ add_executable(colobot ${SOURCES}) target_link_libraries(colobot ${LIBS}) -INSTALL_TARGETS(/games colobot) +install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR}) +set_target_properties(colobot PROPERTIES INSTALL_RPATH ${COLOBOT_INSTALL_LIB_DIR}) |