# HG changeset patch
# User koda
# Date 1362578969 -3600
# Node ID 3f9853888d4f449fc998920f3d9f2e55e3450cc1
# Parent  f93cc19d8b987fc3b3065f019a1478f3bdd1c1e7
user correct variable and slimmer test, version typos, .dll.a updated

diff -r f93cc19d8b98 -r 3f9853888d4f CMakeLists.txt
--- a/CMakeLists.txt	Wed Mar 06 12:18:42 2013 +0100
+++ b/CMakeLists.txt	Wed Mar 06 15:09:29 2013 +0100
@@ -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 f93cc19d8b98 -r 3f9853888d4f hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Wed Mar 06 12:18:42 2013 +0100
+++ b/hedgewars/CMakeLists.txt	Wed Mar 06 15:09:29 2013 +0100
@@ -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 f93cc19d8b98 -r 3f9853888d4f misc/winutils/lib/libSDL_image.dll.a
Binary file misc/winutils/lib/libSDL_image.dll.a has changed
diff -r f93cc19d8b98 -r 3f9853888d4f misc/winutils/lib/libSDL_mixer.dll.a
Binary file misc/winutils/lib/libSDL_mixer.dll.a has changed