Patch to fix includes from Frank Zago
authorSam Lantinga <slouken@libsdl.org>
Tue, 15 Feb 2011 16:41:04 -0800
changeset 5301248c5c7d6e29
parent 5300 3f825465a14a
child 5302 b1b9ec9874ba
Patch to fix includes from Frank Zago
Makefile.ds
src/events/nds/SDL_ndsgesture.c
src/joystick/nds/SDL_sysjoystick.c
src/thread/nds/SDL_systhread.c
src/video/nds/SDL_ndsvideo.c
     1.1 --- a/Makefile.ds	Tue Feb 15 15:50:21 2011 -0800
     1.2 +++ b/Makefile.ds	Tue Feb 15 16:41:04 2011 -0800
     1.3 @@ -25,7 +25,7 @@
     1.4  CFLAGS	=	-mthumb -mthumb-interwork \
     1.5  		-march=armv5te -mtune=arm946e-s \
     1.6  		-O2 -Wall -Wwrite-strings -Wpointer-arith  \
     1.7 -		-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
     1.8 +		-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
     1.9  
    1.10  #src/audio/disk/SDL_diskaudio.c \
    1.11  #src/audio/dummy/SDL_dummyaudio.c \
    1.12 @@ -122,8 +122,7 @@
    1.13  src/atomic/SDL_spinlock.o: src/atomic/SDL_spinlock.c
    1.14  	$(CC) $(CFLAGS) -mno-thumb -o $@ -c $^
    1.15  
    1.16 -$(TARGET): copy_config \
    1.17 -	$(OBJS)
    1.18 +$(TARGET): copy_config $(OBJS)
    1.19  	$(AR) rc $(TARGET) $(OBJS)
    1.20  	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
    1.21  
     2.1 --- a/src/events/nds/SDL_ndsgesture.c	Tue Feb 15 15:50:21 2011 -0800
     2.2 +++ b/src/events/nds/SDL_ndsgesture.c	Tue Feb 15 16:41:04 2011 -0800
     2.3 @@ -24,8 +24,8 @@
     2.4  /* No supported under the NDS because of math operations. */
     2.5  
     2.6  #include "SDL_events.h"
     2.7 -#include "SDL_events_c.h"
     2.8 -#include "SDL_gesture_c.h"
     2.9 +#include "../SDL_events_c.h"
    2.10 +#include "../SDL_gesture_c.h"
    2.11  
    2.12  int SDL_GestureAddTouch(SDL_Touch* touch)
    2.13  {  
     3.1 --- a/src/joystick/nds/SDL_sysjoystick.c	Tue Feb 15 15:50:21 2011 -0800
     3.2 +++ b/src/joystick/nds/SDL_sysjoystick.c	Tue Feb 15 16:41:04 2011 -0800
     3.3 @@ -31,8 +31,8 @@
     3.4  #include "SDL_error.h"
     3.5  #include "SDL_events.h"
     3.6  #include "SDL_joystick.h"
     3.7 -#include "SDL_sysjoystick.h"
     3.8 -#include "SDL_joystick_c.h"
     3.9 +#include "../SDL_sysjoystick.h"
    3.10 +#include "../SDL_joystick_c.h"
    3.11  
    3.12  #include "../../video/nds/SDL_ndsevents_c.h"
    3.13  
     4.1 --- a/src/thread/nds/SDL_systhread.c	Tue Feb 15 15:50:21 2011 -0800
     4.2 +++ b/src/thread/nds/SDL_systhread.c	Tue Feb 15 16:41:04 2011 -0800
     4.3 @@ -29,7 +29,7 @@
     4.4  
     4.5  #include "SDL_error.h"
     4.6  #include "SDL_thread.h"
     4.7 -#include "SDL_systhread.h"
     4.8 +#include "../SDL_systhread.h"
     4.9  
    4.10  int
    4.11  SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
     5.1 --- a/src/video/nds/SDL_ndsvideo.c	Tue Feb 15 15:50:21 2011 -0800
     5.2 +++ b/src/video/nds/SDL_ndsvideo.c	Tue Feb 15 16:41:04 2011 -0800
     5.3 @@ -35,9 +35,9 @@
     5.4  
     5.5  #include "SDL_video.h"
     5.6  #include "SDL_mouse.h"
     5.7 -#include "SDL_sysvideo.h"
     5.8 -#include "SDL_pixels_c.h"
     5.9 -#include "SDL_events_c.h"
    5.10 +#include "../SDL_sysvideo.h"
    5.11 +#include "../SDL_pixels_c.h"
    5.12 +#include "../../events/SDL_events_c.h"
    5.13  #include "SDL_render.h"
    5.14  #include "SDL_ndsvideo.h"
    5.15  #include "SDL_ndsevents_c.h"