From ca46727d024d8fb3e4fea62ee1179028a62b84b3 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 23 Apr 2005 23:57:17 +0000
Subject: [PATCH] Fix SDL detection.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1677 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/graphics/sdl/dcqueue.c         | 3 ++-
 sc2/src/sc2code/libs/graphics/sdl/opengl.h          | 3 ++-
 sc2/src/sc2code/libs/graphics/sdl/sdl_common.c      | 2 +-
 sc2/src/sc2code/libs/sound/decoders/mikmod/mikmod.h | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sc2/src/sc2code/libs/graphics/sdl/dcqueue.c b/sc2/src/sc2code/libs/graphics/sdl/dcqueue.c
index 981e134d8..bf33a0b3a 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/dcqueue.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/dcqueue.c
@@ -18,9 +18,10 @@
 
 #ifdef GFXMODULE_SDL
 
+#include "port.h"
 #include "sdl_common.h"
 #include "libs/threadlib.h"
-#include "SDL_thread.h"
+#include SDL_INCLUDE(SDL_thread.h)
 #include "libs/graphics/drawcmd.h"
 #include "libs/graphics/sdl/dcqueue.h"
 
diff --git a/sc2/src/sc2code/libs/graphics/sdl/opengl.h b/sc2/src/sc2code/libs/graphics/sdl/opengl.h
index c7828e330..d1c224e0f 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/opengl.h
+++ b/sc2/src/sc2code/libs/graphics/sdl/opengl.h
@@ -82,7 +82,8 @@ typedef unsigned short wchar_t;
 
 #else /* !defined(WIN32) */
 
-#include <SDL_opengl.h>
+#include "port.h"
+#include SDL_INCLUDE(SDL_opengl.h)
 
 #endif /* WIN32 */
 #endif /* HAVE_OPENGL */
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
index bdd389936..fd3a267a8 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
@@ -25,7 +25,6 @@
 #include "dcqueue.h"
 #include "options.h"
 #include "uqmversion.h"
-#include "SDL_thread.h"
 #include "libs/graphics/drawcmd.h"
 #include "libs/input/sdl/vcontrol.h"
 #include "bbox.h"
@@ -34,6 +33,7 @@
 #include "controls.h"
 		// XXX: Should not be included from here.
 #include "uqmdebug.h"
+#include SDL_INCLUDE(SDL_thread.h)
 
 SDL_Surface *SDL_Video;
 SDL_Surface *SDL_Screen;
diff --git a/sc2/src/sc2code/libs/sound/decoders/mikmod/mikmod.h b/sc2/src/sc2code/libs/sound/decoders/mikmod/mikmod.h
index c295b4d71..805b229df 100644
--- a/sc2/src/sc2code/libs/sound/decoders/mikmod/mikmod.h
+++ b/sc2/src/sc2code/libs/sound/decoders/mikmod/mikmod.h
@@ -525,7 +525,8 @@ MIKMODAPI extern struct MLOADER load_xm;  /* FastTracker 2 (by Triton) */
 
 /* SDL_RWops compatability */
 #ifdef USE_RWOPS
-#include "SDL_rwops.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL_rwops.h)
 MIKMODAPI extern MODULE* Player_LoadRW(SDL_RWops*,int,BOOL);
 #endif /* USE_RWOPS */
 /* End SDL_RWops compatability */