build: fix a few macro logic issues in SDL.h inclusion.

build/autotools/m4/lol-sdl.m4

@@ -9,13 +9,12 @@ dnl  Defined C/C++ macros:
 dnl    USE_SDL         -- whether SDL or SDL2 were found at all
 dnl    USE_SDL_IMAGE   -- whether SDL_image was found
 dnl    USE_SDL_MIXER   -- whether SDL_mixer was found
-dnl    HAVE_SDL2_SDL_H -- whether to include <SDL2/SDL.h>
 dnl    HAVE_SDL_SDL_H  -- whether to include <SDL/SDL.h>
 dnl    HAVE_SDL_H      -- whether to include <SDL.h>
 dnl  Generated automake conditionals:
-dnl    USE_SDL         -- whether SDL or SDL2 were found at all (conditional)
-dnl    USE_SDL_IMAGE   -- whether SDL_image was found (conditional)
-dnl    USE_SDL_MIXER   -- whether SDL_mixer was found (conditional)
+dnl    USE_SDL         -- whether SDL or SDL2 were found at all
+dnl    USE_SDL_IMAGE   -- whether SDL_image was found
+dnl    USE_SDL_MIXER   -- whether SDL_mixer was found
 dnl  Generated shell variables:
 dnl    SDL_CFLAGS      -- flags for SDL compilation
 dnl    SDL_LIBS        -- flags for SDL linking

src/application/application.cpp

@@ -54,7 +54,7 @@ class ApplicationData
 #elif defined HAVE_GLES_2X
     /* FIXME: this macro is only deactivated if we include "lolgl.h" */
     EglApp app;
-#elif defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
+#elif defined USE_SDL
     SdlApp app;
 #else
 #   error No application class available on this platform

src/eglapp.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if defined USE_SDL
-#   if defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
+#   if defined HAVE_SDL_SDL_H
 #      include <SDL/SDL.h>
 #   else
 #      include <SDL.h>

src/platform/sdl/sdlapp.cpp

@@ -13,9 +13,7 @@
 #endif
 
 #if defined USE_SDL
-#   if defined HAVE_SDL2_SDL_H
-#      include <SDL2/SDL.h>
-#   elif defined HAVE_SDL_SDL_H
+#   if defined HAVE_SDL_SDL_H
 #      include <SDL/SDL.h>
 #   else
 #      include <SDL.h>

src/sys/timer.cpp

@@ -30,7 +30,7 @@
 #   include <sys/sys_time.h>
 #   include <sys/timer.h>
 #   include <sys/time_util.h>
-#elif defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
+#elif defined HAVE_SDL_SDL_H
 #   include <SDL/SDL.h>
 #else
 #   include <SDL.h>