diff options
| author | erihel <erihel@gmail.com> | 2013-01-16 01:45:38 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-01-16 01:45:38 +0100 |
| commit | 9f75a29e88da36edc301fc35f70d260a7b4e660d (patch) | |
| tree | bd0875815df502462b8bef2ba42344632e251af6 /src/CMakeLists.txt | |
| parent | 01c39c88f67a924e6f067efdb16a750f8e19ea92 (diff) | |
| download | colobot-9f75a29e88da36edc301fc35f70d260a7b4e660d.tar.gz colobot-9f75a29e88da36edc301fc35f70d260a7b4e660d.tar.bz2 colobot-9f75a29e88da36edc301fc35f70d260a7b4e660d.zip | |
* Fixed sound pitch causing segfault
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 69164dd..238b8ba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # Compile flags as defined in global CMakeLists -set(CMAKE_CXX_FLAGS ${COLOBOT_CXX_FLAGS}) +set(CMAKE_CXX_FLAGS "${COLOBOT_CXX_FLAGS} ${MXE_CFLAGS}") set(CMAKE_CXX_FLAGS_RELEASE ${COLOBOT_CXX_FLAGS_RELEASE}) set(CMAKE_CXX_FLAGS_DEBUG ${COLOBOT_CXX_FLAGS_DEBUG}) @@ -27,11 +27,7 @@ endif() set(OPTIONAL_LIBS "") if (${OPENAL_SOUND}) - if (${MXE}) - set(OPTIONAL_LIBS - ${CMAKE_FIND_ROOT_PATH}/lib/libOpenAL32.a - ) - elseif (${PLATFORM_WINDOWS}) + if (${PLATFORM_WINDOWS}) set(OPTIONAL_LIBS OpenAL32 ) @@ -43,8 +39,6 @@ if (${OPENAL_SOUND}) endif() # Additional libraries per platform -set(PLATFORM_LIBS "") - if (${MXE}) # MXE requires special treatment set(PLATFORM_LIBS ${MXE_LIBS}) elseif (${PLATFORM_WINDOWS}) @@ -201,8 +195,8 @@ ${PNG_LIBRARIES} ${GLEW_LIBRARY} ${Boost_LIBRARIES} ${OPTIONAL_LIBS} -${PLATFORM_LIBS} ${LIBSNDFILE_LIBRARY} +${PLATFORM_LIBS} ) # Local @@ -210,7 +204,6 @@ include_directories( . .. ${CMAKE_CURRENT_BINARY_DIR} -${LIBSNDFILE_INCLUDE_DIR} ) # System @@ -223,6 +216,7 @@ ${PNG_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${Boost_INCLUDE_DIRS} ${OPTIONAL_INCLUDE_DIRS} +${LIBSNDFILE_INCLUDE_DIR} ) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot) |