From 1b2a4ca8d16b129179cff0eb596584baa34fc26b Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 13 Dec 2015 01:30:38 +0000
Subject: [PATCH] build: fix issues with SDL detection on 32-bit systems.

---
 src/audio.cpp                 | 18 +++++++++---------
 src/image/codec/sdl-image.cpp | 14 +++++++-------
 src/sample.cpp                | 18 +++++++++---------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index 7af02e24..791d16d7 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -10,16 +10,16 @@
 
 #include <lol/engine-internal.h>
 
-#if defined USE_SDL_MIXER
-#   if defined HAVE_SDL_SDL_H
-#      include <SDL/SDL.h>
-#   else
-#      include <SDL.h>
-#   endif
-#   if defined HAVE_SDL_SDL_MIXER_H
-#      include <SDL/SDL_mixer.h>
+#if USE_SDL_MIXER
+#   if HAVE_SDL_SDL_H
+#       include <SDL/SDL.h>
+#       include <SDL/SDL_mixer.h>
+#   elif HAVE_SDL2_SDL_H
+#       include <SDL2/SDL.h>
+#       include <SDL2/SDL_mixer.h>
 #   else
-#      include <SDL_mixer.h>
+#       include <SDL.h>
+#       include <SDL_mixer.h>
 #   endif
 #endif
 
diff --git a/src/image/codec/sdl-image.cpp b/src/image/codec/sdl-image.cpp
index 1df3a120..a731b2e4 100644
--- a/src/image/codec/sdl-image.cpp
+++ b/src/image/codec/sdl-image.cpp
@@ -12,16 +12,16 @@
 
 #include <lol/engine-internal.h>
 
-#if defined USE_SDL_IMAGE
+#if USE_SDL_IMAGE
 
-#if defined HAVE_SDL_SDL_H
+#if HAVE_SDL_SDL_H
 #   include <SDL/SDL.h>
-#else
-#   include <SDL.h>
-#endif
-#if defined HAVE_SDL_SDL_IMAGE_H
 #   include <SDL/SDL_image.h>
+#elif HAVE_SDL2_SDL_H
+#   include <SDL2/SDL.h>
+#   include <SDL2/SDL_image.h>
 #else
+#   include <SDL.h>
 #   include <SDL_image.h>
 #endif
 
@@ -121,5 +121,5 @@ SDL_Surface *SdlImageCodec::Create32BppSurface(ivec2 size)
 
 } /* namespace lol */
 
-#endif /* defined USE_SDL_IMAGE */
+#endif /* USE_SDL_IMAGE */
 
diff --git a/src/sample.cpp b/src/sample.cpp
index 4ec87ff0..8276527e 100644
--- a/src/sample.cpp
+++ b/src/sample.cpp
@@ -16,16 +16,16 @@
 #include <cstdio>
 #include <cstring>
 
-#if defined USE_SDL_MIXER
-#   if defined HAVE_SDL_SDL_H
-#      include <SDL/SDL.h>
-#   else
-#      include <SDL.h>
-#   endif
-#   if defined HAVE_SDL_SDL_MIXER_H
-#      include <SDL/SDL_mixer.h>
+#if USE_SDL_MIXER
+#   if HAVE_SDL_SDL_H
+#       include <SDL/SDL.h>
+#        include <SDL/SDL_mixer.h>
+#   elif HAVE_SDL2_SDL_H
+#       include <SDL2/SDL.h>
+#       include <SDL2/SDL_mixer.h>
 #   else
-#      include <SDL_mixer.h>
+#       include <SDL.h>
+#       include <SDL_mixer.h>
 #   endif
 #endif