fix compilation issues with new devkitPPC

dborth · Aug 31, 2018 · d171856 · d171856
1 parent 442f4b6
commit d171856
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 6 deletions.
diff --git a/SDL/.gitignore b/SDL/.gitignore
@@ -0,0 +1 @@
+/lib/
diff --git a/SDL/src/timer/wii/SDL_systimer.c b/SDL/src/timer/wii/SDL_systimer.c
@@ -42,11 +42,12 @@ Uint32 SDL_GetTicks (void)
 
 void SDL_Delay (Uint32 ms)
 {
-	struct timespec ts;
-
-	ts.tv_sec = ms/1000;
-	ts.tv_nsec = (ms-ts.tv_sec*1000)*1000000;
-	nanosleep(&ts);
+	struct timespec elapsed, tv;
+	elapsed.tv_sec = ms/1000;
+	elapsed.tv_nsec = (ms%1000)*1000000;
+	tv.tv_sec = elapsed.tv_sec;
+	tv.tv_nsec = elapsed.tv_nsec;
+	nanosleep(&tv, &elapsed);
 }
 
 #include "SDL_thread.h"

diff --git a/SDL_gfx/.gitignore b/SDL_gfx/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/lib/
+/obj/
diff --git a/SDL_image/.gitignore b/SDL_image/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/lib/
+/obj/
diff --git a/SDL_mixer/.gitignore b/SDL_mixer/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/obj/
+/lib/
diff --git a/SDL_mixer/Makefile b/SDL_mixer/Makefile
@@ -81,7 +81,7 @@ $(INCLUDE_DIR)/SDL_mixer.h: $(SRC_DIR)/SDL_mixer.h
 
 # Compilation flags.
 COMMON_FLAGS	:= -g -O3 -mrvl -Wall $(MACHDEP)
-INCLUDES		:= -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(LIBOGC_INC)/mpeg -I$(DEVKITPRO)/libsmpeg/include -Isrc/mikmod -Isrc/timidity -I../SDL/include
+INCLUDES		:= -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(LIBOGC_INC)/mpeg -I../smpeg/include -Isrc/mikmod -Isrc/timidity -I../SDL/include
 # -include sys/wait.h 
 # -include sys/syslimits.h
 # -Isrc/native_midi

diff --git a/SDL_net/.gitignore b/SDL_net/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/lib/
+/obj/
diff --git a/SDL_ttf/.gitignore b/SDL_ttf/.gitignore
@@ -0,0 +1,3 @@
+/lib/
+/obj/
+/include/
diff --git a/smpeg/.gitignore b/smpeg/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/lib/
+/obj/