[colobot] 10/377: MXE build fixes

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 27758dacada9dce2b0f4b879dcc3efd6bb564187
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Sep 26 14:24:53 2015 +0200

    MXE build fixes
---
 cmake/mxe.cmake | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmake/mxe.cmake b/cmake/mxe.cmake
index 2c24b1b..0356453 100644
--- a/cmake/mxe.cmake
+++ b/cmake/mxe.cmake
@@ -12,9 +12,6 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS))
     # All must be static, CBOT and GLEW too
     set(CBOT_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})
         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/libvorbisfile.a
             ${CMAKE_FIND_ROOT_PATH}/lib/libogg.a
-            ${CMAKE_FIND_ROOT_PATH}/lib/libwsock32.a
         )
     endif()
 
@@ -39,10 +35,18 @@ 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
+      ${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}
     )
-    # This fixes problem with multiple definition of `IID_IDirectSoundNotify'
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition")
 else()
     set(MXE 0)
 endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git