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 /cmake | |
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 'cmake')
-rw-r--r-- | cmake/mxe.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cmake/mxe.cmake b/cmake/mxe.cmake index 322ba4a..5502c1b 100644 --- a/cmake/mxe.cmake +++ b/cmake/mxe.cmake @@ -12,6 +12,19 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS)) # Because find package scripts are lame set(SDLTTF_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/include/SDL) set(SDLIMAGE_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/include/SDL) + + if (${OPENAL_SOUND}) + set(OPENAL_MXE_LIBS + ${CMAKE_FIND_ROOT_PATH}/lib/libFLAC.a + ${CMAKE_FIND_ROOT_PATH}/lib/libvorbis.a + ${CMAKE_FIND_ROOT_PATH}/lib/libvorbisenc.a + ${CMAKE_FIND_ROOT_PATH}/lib/libvorbisfile.a + ${CMAKE_FIND_ROOT_PATH}/lib/libogg.a + ${CMAKE_FIND_ROOT_PATH}/lib/libwsock32.a + ) + endif() + + set(MXE_CFLAGS "-DAL_LIBTYPE_STATIC") set(MXE_LIBS # For some reason, these have to be absolute paths ${CMAKE_FIND_ROOT_PATH}/lib/libintl.a @@ -23,6 +36,7 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS)) ${CMAKE_FIND_ROOT_PATH}/lib/libwinmm.a ${CMAKE_FIND_ROOT_PATH}/lib/libdxguid.a ${CMAKE_FIND_ROOT_PATH}/lib/libbz2.a + ${OPENAL_MXE_LIBS} ) else() set(MXE 0) |