Commit 8abd1a05 authored by Sam Lantinga's avatar Sam Lantinga

Patch to fix includes from Frank Zago

parent c1b336b8
...@@ -25,7 +25,7 @@ TARGET = libSDL.a ...@@ -25,7 +25,7 @@ TARGET = libSDL.a
CFLAGS = -mthumb -mthumb-interwork \ CFLAGS = -mthumb -mthumb-interwork \
-march=armv5te -mtune=arm946e-s \ -march=armv5te -mtune=arm946e-s \
-O2 -Wall -Wwrite-strings -Wpointer-arith \ -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/disk/SDL_diskaudio.c \
#src/audio/dummy/SDL_dummyaudio.c \ #src/audio/dummy/SDL_dummyaudio.c \
...@@ -122,8 +122,7 @@ all: $(TARGET) install nds_test ...@@ -122,8 +122,7 @@ all: $(TARGET) install nds_test
src/atomic/SDL_spinlock.o: src/atomic/SDL_spinlock.c src/atomic/SDL_spinlock.o: src/atomic/SDL_spinlock.c
$(CC) $(CFLAGS) -mno-thumb -o $@ -c $^ $(CC) $(CFLAGS) -mno-thumb -o $@ -c $^
$(TARGET): copy_config \ $(TARGET): copy_config $(OBJS)
$(OBJS)
$(AR) rc $(TARGET) $(OBJS) $(AR) rc $(TARGET) $(OBJS)
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
/* No supported under the NDS because of math operations. */ /* No supported under the NDS because of math operations. */
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_events_c.h" #include "../SDL_events_c.h"
#include "SDL_gesture_c.h" #include "../SDL_gesture_c.h"
int SDL_GestureAddTouch(SDL_Touch* touch) int SDL_GestureAddTouch(SDL_Touch* touch)
{ {
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"
#include "SDL_sysjoystick.h" #include "../SDL_sysjoystick.h"
#include "SDL_joystick_c.h" #include "../SDL_joystick_c.h"
#include "../../video/nds/SDL_ndsevents_c.h" #include "../../video/nds/SDL_ndsevents_c.h"
......
...@@ -29,7 +29,7 @@ static char rcsid = ...@@ -29,7 +29,7 @@ static char rcsid =
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_thread.h" #include "SDL_thread.h"
#include "SDL_systhread.h" #include "../SDL_systhread.h"
int int
SDL_SYS_CreateThread(SDL_Thread * thread, void *args) SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
......
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_mouse.h" #include "SDL_mouse.h"
#include "SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "SDL_pixels_c.h" #include "../SDL_pixels_c.h"
#include "SDL_events_c.h" #include "../../events/SDL_events_c.h"
#include "SDL_render.h" #include "SDL_render.h"
#include "SDL_ndsvideo.h" #include "SDL_ndsvideo.h"
#include "SDL_ndsevents_c.h" #include "SDL_ndsevents_c.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment