--- a/cmake_modules/FindSDL_Extras.cmake	Thu Nov 24 13:44:30 2011 +0100
+++ b/cmake_modules/FindSDL_Extras.cmake	Sun Oct 28 13:28:23 2012 +0100
@@ -1,22 +1,5 @@
 #if the headers are not installed, the newer apis won't be activated
 
-#find which version of SDL we are building against
-find_file(sdl_h SDL_version.h ${SDL_INCLUDE_DIR})
-if(sdl_h)
-    file(STRINGS ${sdl_h} sdl_majorversion_tmp REGEX "SDL_MAJOR_VERSION[\t' ']+[0-9]+")
-    file(STRINGS ${sdl_h} sdl_minorversion_tmp REGEX "SDL_MINOR_VERSION[\t' ']+[0-9]+")
-    file(STRINGS ${sdl_h} sdl_patchversion_tmp REGEX "SDL_PATCHLEVEL[\t' ']+[0-9]+")
-    string(REGEX MATCH ".([0-9]+)" sdl_majorversion "${sdl_majorversion_tmp}")
-    string(REGEX MATCH ".([0-9]+)" sdl_minorversion "${sdl_minorversion_tmp}")
-    string(REGEX MATCH ".([0-9]+)" sdl_patchversion "${sdl_patchversion_tmp}")
-    math(EXPR sdl_version "${sdl_majorversion}*10000 + ${sdl_minorversion}*100 + ${sdl_patchversion}")
-
-    if(NOT (sdl_version LESS "010300"))
-        message(STATUS "Enabling SDL-1.3+ calls")
-        set(pascal_compiler_flags_cmn "-dSDL13" ${pascal_compiler_flags_cmn})
-    endif()
-endif()
-
 #find which version of SDL_mixer we have (for Mix_Init)
 find_file(sdlmixer_h SDL_mixer.h ${SDLMIXER_INCLUDE_DIR})
 if(sdlmixer_h)
@@ -29,8 +12,8 @@
     math(EXPR sdlmixer_version "${sdlmixer_majorversion}*10000 + ${sdlmixer_minorversion}*100 + ${sdlmixer_patchversion}")
 
     if(sdlmixer_version GREATER "10209")
-        message(STATUS "Enabling enhanced SDL_Mixer calls")
-        set(pascal_compiler_flags_cmn "-dSDL_MIXER_NEWER" ${pascal_compiler_flags_cmn})
+        message(STATUS "Mix_Init() is present")
+        set(pascal_flags "-dSDL_MIXER_NEWER" ${pascal_flags})
     endif()
 endif()
 
@@ -46,8 +29,8 @@
     math(EXPR sdlimage_version "${sdlimage_majorversion}*10000 + ${sdlimage_minorversion}*100 + ${sdlimage_patchversion}")
 
     if(sdlimage_version GREATER "010207")
-        message(STATUS "Enabling enhanced SDL_Image calls")
-        set(pascal_compiler_flags_cmn "-dSDL_IMAGE_NEWER" ${pascal_compiler_flags_cmn})
+        message(STATUS "IMG_Init() is present")
+        set(pascal_flags "-dSDL_IMAGE_NEWER" ${pascal_flags})
     endif()
 endif()