From 5958ee898101085ef339c03dc8164113635561b1 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 15 Feb 2011 16:41:04 -0800
Subject: [PATCH] Patch to fix includes from Frank Zago

---
 Makefile.ds                        | 5 ++---
 src/events/nds/SDL_ndsgesture.c    | 4 ++--
 src/joystick/nds/SDL_sysjoystick.c | 4 ++--
 src/thread/nds/SDL_systhread.c     | 2 +-
 src/video/nds/SDL_ndsvideo.c       | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Makefile.ds b/Makefile.ds
index fb984819d..b20848c6f 100644
--- a/Makefile.ds
+++ b/Makefile.ds
@@ -25,7 +25,7 @@ TARGET = libSDL.a
 CFLAGS	=	-mthumb -mthumb-interwork \
 		-march=armv5te -mtune=arm946e-s \
 		-O2 -Wall -Wwrite-strings -Wpointer-arith  \
-		-DARM9 -D__NDS__ -I$(DEVKITPRO)/libnds/include -DENABLE_NDS -DNO_SIGNAL_H -DDISABLE_THREADS -DPACKAGE=\"SDL\" -DVERSION=\"1.3\" -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1
+		-DARM9 -D__NDS__ -I$(DEVKITPRO)/libnds/include -DENABLE_NDS -DNO_SIGNAL_H -DDISABLE_THREADS -DPACKAGE=\"SDL\" -DVERSION=\"1.3\" -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -Iinclude
 
 #src/audio/disk/SDL_diskaudio.c \
 #src/audio/dummy/SDL_dummyaudio.c \
@@ -122,8 +122,7 @@ all: $(TARGET) install nds_test
 src/atomic/SDL_spinlock.o: src/atomic/SDL_spinlock.c
 	$(CC) $(CFLAGS) -mno-thumb -o $@ -c $^
 
-$(TARGET): copy_config \
-	$(OBJS)
+$(TARGET): copy_config $(OBJS)
 	$(AR) rc $(TARGET) $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
diff --git a/src/events/nds/SDL_ndsgesture.c b/src/events/nds/SDL_ndsgesture.c
index b2b4d71e9..161cbf5b9 100644
--- a/src/events/nds/SDL_ndsgesture.c
+++ b/src/events/nds/SDL_ndsgesture.c
@@ -24,8 +24,8 @@
 /* No supported under the NDS because of math operations. */
 
 #include "SDL_events.h"
-#include "SDL_events_c.h"
-#include "SDL_gesture_c.h"
+#include "../SDL_events_c.h"
+#include "../SDL_gesture_c.h"
 
 int SDL_GestureAddTouch(SDL_Touch* touch)
 {  
diff --git a/src/joystick/nds/SDL_sysjoystick.c b/src/joystick/nds/SDL_sysjoystick.c
index 9d55acb5d..53cee22dd 100644
--- a/src/joystick/nds/SDL_sysjoystick.c
+++ b/src/joystick/nds/SDL_sysjoystick.c
@@ -31,8 +31,8 @@
 #include "SDL_error.h"
 #include "SDL_events.h"
 #include "SDL_joystick.h"
-#include "SDL_sysjoystick.h"
-#include "SDL_joystick_c.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
 
 #include "../../video/nds/SDL_ndsevents_c.h"
 
diff --git a/src/thread/nds/SDL_systhread.c b/src/thread/nds/SDL_systhread.c
index 80d0997f6..171a6dd75 100644
--- a/src/thread/nds/SDL_systhread.c
+++ b/src/thread/nds/SDL_systhread.c
@@ -29,7 +29,7 @@ static char rcsid =
 
 #include "SDL_error.h"
 #include "SDL_thread.h"
-#include "SDL_systhread.h"
+#include "../SDL_systhread.h"
 
 int
 SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
diff --git a/src/video/nds/SDL_ndsvideo.c b/src/video/nds/SDL_ndsvideo.c
index f98359fa5..824f7c699 100644
--- a/src/video/nds/SDL_ndsvideo.c
+++ b/src/video/nds/SDL_ndsvideo.c
@@ -35,9 +35,9 @@
 
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_sysvideo.h"
-#include "SDL_pixels_c.h"
-#include "SDL_events_c.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
 #include "SDL_render.h"
 #include "SDL_ndsvideo.h"
 #include "SDL_ndsevents_c.h"