Fix SDL detection.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1671 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/port.h

@@ -137,6 +137,20 @@ iswgraph(wint_t wc)
 }
 #endif
 
+// Use SDL_INCLUDE to portably include the SDL files from the right
+// location. TODO: Where SDL_H is located could be detected from the build
+// script.
+#ifdef APPLE
+#	define HAVE_SDL_SDL_H
+#else
+#	define HAVE_SDL_H
+#endif
+#ifdef HAVE_SDL_H
+#	define SDL_INCLUDE(file) <file>
+#elif defined(HAVE_SDL_SDL_H)
+#	define SDL_INCLUDE(file) <SDL/file>
+#endif
+
 #endif  /* _PORT_H */
 
 

sc2/src/sc2code/libs/graphics/sdl/bbox.c

@@ -1,4 +1,5 @@
-#include "SDL.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
 #include "bbox.h"
 
 TFB_BoundingBox TFB_BBox;

sc2/src/sc2code/libs/graphics/sdl/canvas.c

@@ -1,4 +1,5 @@
-#include "SDL.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
 #include "sdl_common.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/graphics/sdl/primitives.h"

sc2/src/sc2code/libs/graphics/sdl/rotozoom.h

@@ -18,7 +18,8 @@
 #define M_PI	3.141592654
 #endif
 
-#include "SDL.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
 
 
 /* ---- Defines */

sc2/src/sc2code/libs/graphics/sdl/sdl_common.h

@@ -19,9 +19,10 @@
 #ifndef SDL_COMMON_H
 #define SDL_COMMON_H
 
-#include "SDL.h"
-#include "SDL_image.h"
-#include "SDL_byteorder.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
+#include SDL_INCLUDE(SDL_image.h)
+#include SDL_INCLUDE(SDL_byteorder.h)
 
 #include "libs/graphics/gfxintrn.h"
 #include "libs/graphics/tfb_draw.h"

sc2/src/sc2code/libs/graphics/sdl/sdluio.c

@@ -2,10 +2,10 @@
 
 #include "port.h"
 #include "libs/uio.h"
-#include "SDL.h"
-#include "SDL_image.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
+#include SDL_INCLUDE(SDL.h)
+#include SDL_INCLUDE(SDL_image.h)
+#include SDL_INCLUDE(SDL_error.h)
+#include SDL_INCLUDE(SDL_rwops.h)
 #include "libs/misc.h"
 #include <errno.h>
 #include <string.h>

sc2/src/sc2code/libs/graphics/sdl/sdluio.h

@@ -3,8 +3,8 @@
 
 #include "port.h"
 #include "libs/uio.h"
-#include "SDL.h"
-#include "SDL_rwops.h"
+#include SDL_INCLUDE(SDL.h)
+#include SDL_INCLUDE(SDL_rwops.h)
 
 SDL_Surface *sdluio_loadImage (uio_DirHandle *dir, const char *fileName);
 int sdluio_seek (SDL_RWops *context, int offset, int whence);

sc2/src/sc2code/libs/input/sdl/keynames.c

@@ -1,7 +1,7 @@
-#include <SDL.h>
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
 #include <string.h>
 #include "keynames.h"
-#include "port.h"
 
 /* This code is adapted from the code in SDL_keysym.h.  Though this
  * would almost certainly be fast if we were to use a direct char *

sc2/src/sc2code/libs/input/sdl/vcontrol.c

@@ -1,11 +1,11 @@
-#include <SDL.h>
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include "vcontrol.h"
 #include "vcontrol_malloc.h"
 #include "keynames.h"
-#include "port.h"
 
 /* How many binding slots are allocated at once. */
 #define POOL_CHUNK_SIZE 64

sc2/src/sc2code/libs/input/sdl/vcontrol.h

@@ -1,10 +1,9 @@
-#include <SDL.h>
-
 #ifndef _VCONTROL_H_
 #define _VCONTROL_H_
 
 #include "port.h"
 #include "libs/uio.h"
+#include SDL_INCLUDE(SDL.h)
 
 /* Initialization routines */
 void VControl_Init (void);

sc2/src/sc2code/libs/sound/mixer/sdl/audiodrv_sdl.h

@@ -20,10 +20,10 @@
 #ifndef _AUDIODRV_SDL_H
 #define _AUDIODRV_SDL_H
 
-#include "config.h"
+#include "port.h"
 #include "libs/sound/sound.h"
 #include "libs/sound/mixer/mixer.h"
-#include <SDL.h>
+#include SDL_INCLUDE(SDL.h)
 
 /* General */
 sint32 mixSDL_Init (audio_Driver *driver, sint32 flags);

sc2/src/sc2code/libs/threads/sdl/sdlthreads.h

@@ -20,8 +20,9 @@
 #ifndef _SDLTHREAD_H
 #define _SDLTHREAD_H
 
-#include "SDL.h"
-#include "SDL_thread.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
+#include SDL_INCLUDE(SDL_thread.h)
 #include "libs/threadlib.h"
 #include "libs/timelib.h"
 

sc2/src/sc2code/libs/time/sdl/sdltime.h

@@ -20,7 +20,8 @@
 #ifndef _SDLTIME_H
 #define _SDLTIME_H
 
-#include "SDL.h"
+#include "port.h"
+#include SDL_INCLUDE(SDL.h)
 #include "../timecommon.h"
 
 #define NativeInitTimeSystem()

sc2/src/starcon2.c

@@ -43,7 +43,7 @@
 
 
 #if defined(GFXMODULE_SDL)
-#	include <SDL.h>
+#	include SDL_INCLUDE(SDL.h)
 			// Including this is actually necessary on OSX.
 #endif