From c6a9027b7cf0d35401cae346b67ca95c5f55b4a1 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 3 Nov 2007 00:06:23 +0000
Subject: * Merge ioq3-r1204

---
 src/sdl/sdl_gamma.c |  7 ++++++-
 src/sdl/sdl_glimp.c | 12 ++++++++++--
 src/sdl/sdl_input.c |  6 +++++-
 src/sdl/sdl_snd.c   |  6 +++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'src/sdl')

diff --git a/src/sdl/sdl_gamma.c b/src/sdl/sdl_gamma.c
index 0b63b85a..346bcfd2 100644
--- a/src/sdl/sdl_gamma.c
+++ b/src/sdl/sdl_gamma.c
@@ -20,7 +20,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+#	include "SDL.h"
+#else
+#	include <SDL.h>
+#endif
+
 #include "../renderer/tr_local.h"
 #include "../qcommon/qcommon.h"
 
diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index 1f5c3434..cb3e8e0d 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -20,7 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+#	include "SDL.h"
+#else
+#	include <SDL.h>
+#endif
 
 #if !SDL_VERSION_ATLEAST(1, 2, 10)
 #define SDL_GL_ACCELERATED_VISUAL 15
@@ -30,7 +34,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #ifdef SMP
-#include "SDL_thread.h"
+#	ifdef USE_LOCAL_HEADERS
+#		include "SDL_thread.h"
+#	else
+#		include <SDL_thread.h>
+#	endif
 #endif
 
 #include <stdarg.h>
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c
index 1e2ca988..d65c3504 100644
--- a/src/sdl/sdl_input.c
+++ b/src/sdl/sdl_input.c
@@ -20,7 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+#	include "SDL.h"
+#else
+#	include <SDL.h>
+#endif
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/sdl/sdl_snd.c b/src/sdl/sdl_snd.c
index ea7927ee..4a4c78d1 100644
--- a/src/sdl/sdl_snd.c
+++ b/src/sdl/sdl_snd.c
@@ -23,7 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+#	include "SDL.h"
+#else
+#	include <SDL.h>
+#endif
 
 #include "../qcommon/q_shared.h"
 #include "../client/snd_local.h"
-- 
cgit