# HG changeset patch
# User nemo
# Date 1362580940 18000
# Node ID fcb87b74ea7ec25c5aa703191cedaa2349d191c1
# Parent  b04a3724e3287a40b21433b6e81316fdb489c657# Parent  3f9853888d4f449fc998920f3d9f2e55e3450cc1
*sigh* I always forget to pull when AFK for a while. btw. why are we still keeping binaries in here? ☹

diff -r b04a3724e328 -r fcb87b74ea7e CMakeLists.txt
--- a/CMakeLists.txt	Wed Mar 06 08:26:14 2013 -0500
+++ b/CMakeLists.txt	Wed Mar 06 09:42:20 2013 -0500
@@ -226,16 +226,16 @@
 endif()
 
 #TODO: find out why we need this...
-include(CheckCSourceCompiles)
-set(CMAKE_REQUIRED_FLAG "-Wl,-z -Wl,noexecstack")
-check_c_source_compiles("int main(void) { return 0; }" HAVE_NOEXECSTACK)
+include(CheckCCompilerFlag)
+set(CMAKE_REQUIRED_FLAGS "-Wl,-z -Wl,noexecstack")
+check_c_compiler_flag("" HAVE_NOEXECSTACK) #empty because we are testing a linker flag
 if(HAVE_NOEXECSTACK)
     list(APPEND pascal_flags "-k-z" "-knoexecstack")
     if(NOT ${MINIMAL_FLAGS})
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_REQUIRED_FLAG}")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif()
 endif()
-unset(CMAKE_REQUIRED_FLAG)
+unset(CMAKE_REQUIRED_FLAGS)
 
 #parse additional parameters
 if(FPFLAGS OR GHFLAGS)
diff -r b04a3724e328 -r fcb87b74ea7e hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Wed Mar 06 08:26:14 2013 -0500
+++ b/hedgewars/CMakeLists.txt	Wed Mar 06 09:42:20 2013 -0500
@@ -5,12 +5,12 @@
 find_package(SDL_mixer)
 
 include (CheckLibraryExists)
-#Mix_Init/Mix_Quit from SDL_mixer 1.2.9
+#Mix_Init/Mix_Quit from SDL_mixer 1.2.10
 check_library_exists(${SDLMIXER_LIBRARY} Mix_Init "" HAVE_MIXINIT)
 if(HAVE_MIXINIT)
     list(APPEND pascal_flags "-dSDL_MIXER_NEWER")
 endif()
-#IMG_Init/IMG_Quit from SDL_image 1.2.7
+#IMG_Init/IMG_Quit from SDL_image 1.2.8
 check_library_exists(${SDLIMAGE_LIBRARY} IMG_Init "" HAVE_IMGINIT)
 if(HAVE_IMGINIT)
     list(APPEND pascal_flags "-dSDL_IMAGE_NEWER")
diff -r b04a3724e328 -r fcb87b74ea7e misc/winutils/lib/libSDL_image.dll.a
Binary file misc/winutils/lib/libSDL_image.dll.a has changed
diff -r b04a3724e328 -r fcb87b74ea7e misc/winutils/lib/libSDL_mixer.dll.a
Binary file misc/winutils/lib/libSDL_mixer.dll.a has changed