immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MXE build fixes

dev-time-step
krzys-h 2015-09-26 14:24:53 +02:00
parent f6823389cc
commit 27758dacad
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/mxe.cmake
View File

@ -12,9 +12,6 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS))
# All must be static, CBOT and GLEW too # All must be static, CBOT and GLEW too
set(CBOT_STATIC ON) set(CBOT_STATIC ON)
set(GLEW_STATIC ON) set(GLEW_STATIC ON)
# 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}) if (${OPENAL_SOUND})
set(OPENAL_MXE_LIBS set(OPENAL_MXE_LIBS
@ -23,7 +20,6 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS))
${CMAKE_FIND_ROOT_PATH}/lib/libvorbisenc.a ${CMAKE_FIND_ROOT_PATH}/lib/libvorbisenc.a
${CMAKE_FIND_ROOT_PATH}/lib/libvorbisfile.a ${CMAKE_FIND_ROOT_PATH}/lib/libvorbisfile.a
${CMAKE_FIND_ROOT_PATH}/lib/libogg.a ${CMAKE_FIND_ROOT_PATH}/lib/libogg.a
${CMAKE_FIND_ROOT_PATH}/lib/libwsock32.a
) )
endif() endif()
@ -39,10 +35,18 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS))
${CMAKE_FIND_ROOT_PATH}/lib/libwinmm.a ${CMAKE_FIND_ROOT_PATH}/lib/libwinmm.a
${CMAKE_FIND_ROOT_PATH}/lib/libdxguid.a ${CMAKE_FIND_ROOT_PATH}/lib/libdxguid.a
${CMAKE_FIND_ROOT_PATH}/lib/libbz2.a ${CMAKE_FIND_ROOT_PATH}/lib/libbz2.a
${CMAKE_FIND_ROOT_PATH}/lib/libimm32.a
${CMAKE_FIND_ROOT_PATH}/lib/libole32.a
${CMAKE_FIND_ROOT_PATH}/lib/liboleaut32.a
${CMAKE_FIND_ROOT_PATH}/lib/libharfbuzz.a
${CMAKE_FIND_ROOT_PATH}/lib/libwebp.a
${CMAKE_FIND_ROOT_PATH}/lib/libversion.a
${CMAKE_FIND_ROOT_PATH}/lib/libglib-2.0.a
${CMAKE_FIND_ROOT_PATH}/lib/libwsock32.a
${CMAKE_FIND_ROOT_PATH}/lib/libws2_32.a
${CMAKE_FIND_ROOT_PATH}/lib/libintl.a
${OPENAL_MXE_LIBS} ${OPENAL_MXE_LIBS}
) )
# This fixes problem with multiple definition of `IID_IDirectSoundNotify'
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition")
else() else()
set(MXE 0) set(MXE 0)
endif() endif()