Merge branch 'dev' into debian

1 files changed, 5 insertions, 7 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a90b735..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,22 +27,18 @@ endif()
 set(OPTIONAL_LIBS "")
 
 if (${OPENAL_SOUND})
-    if (${MXE})
+    if (${PLATFORM_WINDOWS})
         set(OPTIONAL_LIBS
-            ${CMAKE_FIND_ROOT_PATH}/lib/libOpenAL32.a
-            ${CMAKE_FIND_ROOT_PATH}/lib/libalut.a
+            OpenAL32
         )
     else()
         set(OPTIONAL_LIBS
             openal
-            alut
         )
     endif()
 endif()
 
 # Additional libraries per platform
-set(PLATFORM_LIBS "")
-
 if (${MXE}) # MXE requires special treatment
     set(PLATFORM_LIBS ${MXE_LIBS})  
 elseif (${PLATFORM_WINDOWS})
@@ -199,6 +195,7 @@ ${PNG_LIBRARIES}
 ${GLEW_LIBRARY}
 ${Boost_LIBRARIES}
 ${OPTIONAL_LIBS}
+${LIBSNDFILE_LIBRARY}
 ${PLATFORM_LIBS}
 )
 
@@ -219,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)