From 58f35e44ae17a8d4c55b1b19696245666d3697d3 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Mon, 14 Jan 2013 22:55:16 +0100
Subject: * Removed alut * Using libsndfile to load sounds and music * Added
 support for playing music files

---
 src/CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a90b735..69164dd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,12 +30,14 @@ if (${OPENAL_SOUND})
     if (${MXE})
         set(OPTIONAL_LIBS
             ${CMAKE_FIND_ROOT_PATH}/lib/libOpenAL32.a
-            ${CMAKE_FIND_ROOT_PATH}/lib/libalut.a
+        )
+    elseif (${PLATFORM_WINDOWS})
+        set(OPTIONAL_LIBS
+            OpenAL32
         )
     else()
         set(OPTIONAL_LIBS
             openal
-            alut
         )
     endif()
 endif()
@@ -200,6 +202,7 @@ ${GLEW_LIBRARY}
 ${Boost_LIBRARIES}
 ${OPTIONAL_LIBS}
 ${PLATFORM_LIBS}
+${LIBSNDFILE_LIBRARY}
 )
 
 # Local
@@ -207,6 +210,7 @@ include_directories(
 .
 ..
 ${CMAKE_CURRENT_BINARY_DIR}
+${LIBSNDFILE_INCLUDE_DIR}
 )
 
 # System
-- 
cgit v1.2.3-1-g7c22


From 9f75a29e88da36edc301fc35f70d260a7b4e660d Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Wed, 16 Jan 2013 01:45:38 +0100
Subject: * Fixed sound pitch causing segfault * Sound support should now
 compile fine with MXE * Added cache for 3 music files to speedup loading *
 Updated howto

---
 src/CMakeLists.txt | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/CMakeLists.txt')

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)
-- 
cgit v1.2.3-1-g7c22