Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
	src/supertux/main.cpp

Modified CMakeLists.txt to actually build properly

diff --cc CMakeLists.txt
index d423390,2abf1f2..5e82c27
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -66,13 -66,19 +66,14 @@@ FIND_PACKAGE(Boost REQUIRED
  INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIR})
  LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
  
- FIND_PACKAGE(SDL REQUIRED)
- INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
- SET(HAVE_SDL TRUE)
+ INCLUDE(FindPkgConfig)
+ PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+ INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
 -LINK_LIBRARIES(supertux2 ${SDL2_LIBRARIES})
  
- FIND_PACKAGE(SDL_image REQUIRED)
- INCLUDE_DIRECTORIES(${SDLIMAGE_INCLUDE_DIR})
+ PKG_SEARCH_MODULE(SDL2IMAGE REQUIRED SDL2_image>=2.0.0)
+ INCLUDE_DIRECTORIES(${SDL2IMAGE_INCLUDE_DIRS})
 -LINK_LIBRARIES(supertux2 ${SDL2IMAGE_LIBRARIES})
+ SET(HAVE_SDL TRUE)
  
 -#FIND_PACKAGE(SDL_image REQUIRED)
 -#INCLUDE_DIRECTORIES(${SDLIMAGE_INCLUDE_DIR})
 -
  OPTION(ENABLE_OPENGL "Enable OpenGL support" ON)
  IF(ENABLE_OPENGL)
    FIND_PACKAGE(OpenGL)
@@@ -342,8 -348,8 +343,8 @@@ ADD_DEPENDENCIES(supertux2 gitversion
  ## Link supertux binary with squirrel and other libraries
  
  TARGET_LINK_LIBRARIES(supertux2 squirrel)
--TARGET_LINK_LIBRARIES(supertux2 ${SDL_LIBRARY})
--TARGET_LINK_LIBRARIES(supertux2 ${SDLIMAGE_LIBRARY})
++TARGET_LINK_LIBRARIES(supertux2 ${SDL2_LIBRARIES})
++TARGET_LINK_LIBRARIES(supertux2 ${SDL2IMAGE_LIBRARIES})
  TARGET_LINK_LIBRARIES(supertux2 ${OPENAL_LIBRARY})
  TARGET_LINK_LIBRARIES(supertux2 ${OGGVORBIS_LIBRARIES})
  TARGET_LINK_LIBRARIES(supertux2 ${PHYSFS_LIBRARY})