From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Date: Sat, 6 Mar 2010 00:58:52 +0000 (-0500)
Subject: Fix #include <SDL/SDL.h> to be #include <SDL.h>
X-Git-Tag: 1.1.0-pre1~460
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=48ae5b2a99157ce1baec3cdb74e34ada060afc9d;p=vlc

Fix #include <SDL/SDL.h> to be #include <SDL.h>

...as the FAQ on http://libsdl.org/ declares this is the most portable
method.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---

diff --git a/configure.ac b/configure.ac
index e100440304..9dab26a1be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3448,8 +3448,8 @@ then
         SDL_PATH="${with_sdl_config_path}:${PATH}"
       fi ])
   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
-  SDL_HEADER="SDL/SDL.h"
-  SDL_IMAGE="SDL/SDL_image.h"
+  SDL_HEADER="SDL.h"
+  SDL_IMAGE="SDL_image.h"
 
   if test "${SDL_CONFIG}" != "no";  then
      PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
@@ -3457,12 +3457,12 @@ then
         if test "${SYS}" != "darwin"; then
           VLC_ADD_PLUGIN([vout_sdl aout_sdl])
         fi
-        VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags | sed 's,SDL,,'`])
+        VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags`])
         VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`])
 
         # SDL_image
         AS_IF([ test "${enable_sdl_image}" != "no"],[
-          AC_CHECK_HEADERS("SDL/SDL_image.h", [
+          AC_CHECK_HEADERS("SDL_image.h", [
             VLC_ADD_PLUGIN([sdl_image])
             AC_CHECK_LIB(png, png_set_rows, [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz])
             AC_CHECK_LIB(jpeg, jpeg_start_decompress, [VLC_ADD_LIBS([sdl_image],[-ljpeg])])
diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index 16ddb824c9..89bbfb1eb0 100644
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -37,7 +37,7 @@
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #define FRAME_SIZE 2048
 
diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
index 4a9f5d23dd..bd28da7691 100644
--- a/modules/codec/sdl_image.c
+++ b/modules/codec/sdl_image.c
@@ -33,7 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 
-#include <SDL/SDL_image.h>
+#include <SDL_image.h>
 
 /*****************************************************************************
  * decoder_sys_t : sdl decoder descriptor
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index c1c9f01500..579a8cd81c 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -38,7 +38,7 @@
 
 #include <assert.h>
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 /*****************************************************************************
  * Module descriptor