Fix unix-like builds

android/jni/src/Android.mk

@@ -1,21 +1,19 @@
-SDLPAL_LOCAL_PATH := $(call my-dir)
-SDL_PATH := $(SDLPAL_LOCAL_PATH)/../../../SDL2
+CURRENT_PATH := $(call my-dir)
 
+SDL_PATH := $(CURRENT_PATH)/../../../SDL2
 include $(SDL_PATH)/Android.mk
 
 include $(CLEAR_VARS)
-LOCAL_PATH := $(SDLPAL_LOCAL_PATH)
+LOCAL_PATH := $(CURRENT_PATH)/../../..
 LOCAL_MODULE := main
 
-OGG_PATH := ../../../liboggvorbis
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/$(OGG_PATH)/include $(LOCAL_PATH)/$(OGG_PATH)/src
+LOCAL_C_INCLUDES := $(CURRENT_PATH) $(LOCAL_PATH) $(SDL_PATH)/include $(LOCAL_PATH)/src/liboggvorbis/include $(LOCAL_PATH)/src/liboggvorbis/src
 
 LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
-    $(wildcard $(LOCAL_PATH)/../../../*.cpp) $(wildcard $(LOCAL_PATH)/../../../*.c) \
-    $(wildcard $(LOCAL_PATH)/../../../adplug/*.c) $(wildcard $(LOCAL_PATH)/../../../adplug/*.cpp) \
-    $(wildcard $(LOCAL_PATH)/../../../liboggvorbis/src/*.c) \
-    $(wildcard $(LOCAL_PATH)/../../../libmad/*.c)
+    $(wildcard $(LOCAL_PATH)/src/*.cpp) $(wildcard $(LOCAL_PATH)/src/*.c) \
+    $(wildcard $(LOCAL_PATH)/src/adplug/*.c) $(wildcard $(LOCAL_PATH)/src/adplug/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/liboggvorbis/src/*.c) \
+    $(wildcard $(LOCAL_PATH)/src/libmad/*.c)
 
 LOCAL_CFLAGS += -std=c99
 

dingux/Makefile

@@ -2,12 +2,12 @@ TARGET = sdlpal.dge
 
 HOST = mipsel-linux-uclibc-
 
-SOURCES = . ./adplug
+SOURCES = ../src ../src/adplug
 CFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.c))
 CPPFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.cpp))
 OFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
 
-CFLAGS = -g -Wall -O2 `sdl-config --cflags` -DDINGOO -DPAL_CLASSIC -DPAL_HAS_PLATFORM_SPECIFIC_UTILS -I.
+CFLAGS = -g -Wall -O2 `sdl-config --cflags` -DDINGOO -DPAL_CLASSIC -DPAL_HAS_PLATFORM_SPECIFIC_UTILS -I. -I../src
 CXXFLAGS = $(CFLAGS)
 LDFLAGS = `sdl-config --libs`
 

emscripten/Makefile

@@ -5,18 +5,18 @@ TARGET = sdlpal.html
 HOST =
 
 
-CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) em.c
-CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
+CFILES = $(wildcard ../src/adplug/*.c) $(wildcard ../src/libmad/*.c) $(wildcard ../src/liboggvorbis/src/*.c) $(wildcard ../src/*.c) em.c
+CPPFILES = $(wildcard ../src/adplug/*.cpp) $(wildcard ../src/*.cpp) $(wildcard ./*.cpp)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
 
-CFLAGS = -I${EMSCRIPTEN_TOOLCHAIN}/include/SDL2 -g -Wall -O2 -fno-strict-aliasing -I. -I../ -I../liboggvorbis/include -I../liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS
+CFLAGS = -I${EMSCRIPTEN_TOOLCHAIN}/include/SDL2 -g -Wall -O2 -fno-strict-aliasing -I. -I../src -I../src/liboggvorbis/include -I../src/liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS
 LDFLAGS = -L${EMSCRIPTEN_TOOLCHAIN}/lib -lSDL2 -lm -lstdc++ --preload-file data -s TOTAL_MEMORY=134217728 -s TOTAL_STACK=5242880 --emrun -s DEMANGLE_SUPPORT=1 -s EMTERPRETIFY=1 -s EMTERPRETIFY_ASYNC=1 -s 'EMTERPRETIFY_FILE="sdlpal.bc"'
 
 .c.o:
 	emcc -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
 .cpp.o:
 	em++ -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-	
+
 $(TARGET):$(OBJFILES)
 	em++ $(CFLAGS) -o $(TARGET) $(OBJFILES) $(LDFLAGS)
 

emscripten/Makefile.wasm

@@ -5,11 +5,11 @@ TARGET = sdlpal.html
 HOST =
 
 
-CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) em.c
-CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
+CFILES = $(wildcard ../src/adplug/*.c) $(wildcard ../src/libmad/*.c) $(wildcard ../src/liboggvorbis/src/*.c) $(wildcard ../src/*.c) em.c
+CPPFILES = $(wildcard ../src/adplug/*.cpp) $(wildcard ../src/*.cpp) $(wildcard ./*.cpp)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
 
-CFLAGS = -I${EMSCRIPTEN_TOOLCHAIN}/include/SDL2 -g -Wall -O2 -fno-strict-aliasing -I. -I../ -I../liboggvorbis/include -I../liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS
+CFLAGS = -I${EMSCRIPTEN_TOOLCHAIN}/include/SDL2 -g -Wall -O2 -fno-strict-aliasing -I. -I../src -I../src/liboggvorbis/include -I../src/liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS
 LDFLAGS = -L${EMSCRIPTEN_TOOLCHAIN}/lib -lSDL2 -lm -lstdc++ --preload-file data -s TOTAL_MEMORY=134217728 -s TOTAL_STACK=5242880 --emrun -s DEMANGLE_SUPPORT=1 -s WASM=1 -s ASYNCIFY=1
 
 .c.o:

gph/Makefile

@@ -13,12 +13,12 @@ DEVICE = -DCAANOO
 endif
 endif
 
-SOURCES = . .. ../adplug
+SOURCES = . ../src ../src/adplug
 CFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.c))
 CPPFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.cpp))
 OFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
 
-CFLAGS = -g -Wall -O2 `sdl-config --cflags` -DGPH $(DEVICE) -DPAL_HAS_PLATFORM_SPECIFIC_UTILS -I.
+CFLAGS = -g -Wall -O2 `sdl-config --cflags` -DGPH $(DEVICE) -DPAL_HAS_PLATFORM_SPECIFIC_UTILS -I. -I../src
 CXXFLAGS = $(CFLAGS)
 LDFLAGS = `sdl-config --libs`
 

psp/Makefile

@@ -0,0 +1,24 @@
+TARGET = sdlpal
+
+SOURCES = . ../src ../src/adplug ../src/libmad
+CFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.c)) input_PSP.c main_PSP.c
+CPPFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.cpp))
+OFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
+
+PSPSDK = $(shell psp-config --pspsdk-path)
+
+INCDIR = 
+CFLAGS = -O3 -G0 -Wall -g `$(PSPSDK)/../bin/sdl-config --cflags` -DPSP=1 -I. -I../src
+CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti `$(PSPSDK)/../bin/sdl-config --cflags`
+ASFLAGS = $(CFLAGS)
+
+LIBDIR =
+LIBS = `$(PSPSDK)/../bin/sdl-config --libs` -lstdc++
+
+EXTRA_TARGETS = EBOOT.PBP
+PSP_EBOOT_TITLE = sdlpal
+
+BUILD_PRX = 1
+PSP_FW_VERSION = 371
+
+include $(PSPSDK)/lib/build.mak

psp/Makefile.psp

@@ -1,30 +0,0 @@
-TARGET = sdlpal
-
-OBJS = adplug/binfile.o adplug/emuopl.o adplug/fprovide.o adplug/rix.o \
-	adplug/binio.o adplug/fmopl.o adplug/player.o \
-	battle.o getopt.o main.o play.o script.o uigame.o ending.o \
-	global.o map.o res.o sound.o util.o fight.o input_PSP.o palcommon.o \
-	rixplay.o text.o video.o font.o itemmenu.o palette.o rngplay.o \
-	uibattle.o yj1.o game.o magicmenu.o scene.o ui.o \
-	libmad/bit.o libmad/decoder.o libmad/fixed.o libmad/frame.o \
-	libmad/huffman.o libmad/layer12.o libmad/layer3.o libmad/music_mad.o \
-	libmad/stream.o libmad/synth.o libmad/timer.o
-
-
-PSPSDK = $(shell psp-config --pspsdk-path)
-
-INCDIR = 
-CFLAGS = -O3 -G0 -Wall -g `$(PSPSDK)/../bin/sdl-config --cflags` -DPSP=1 -I.
-CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti `$(PSPSDK)/../bin/sdl-config --cflags`
-ASFLAGS = $(CFLAGS)
-
-LIBDIR =
-LIBS = `$(PSPSDK)/../bin/sdl-config --libs` -lstdc++
-
-EXTRA_TARGETS = EBOOT.PBP
-PSP_EBOOT_TITLE = sdlpal
-
-BUILD_PRX = 1
-PSP_FW_VERSION = 371
-
-include $(PSPSDK)/lib/build.mak

unix/Makefile

@@ -4,11 +4,11 @@ TARGET = sdlpal
 
 HOST =
 
-CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c)
-CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
+CFILES = $(wildcard ../src/adplug/*.c) $(wildcard ../src/libmad/*.c) $(wildcard ../src/liboggvorbis/src/*.c) $(wildcard ../src/*.c)
+CPPFILES = $(wildcard ../src/adplug/*.cpp) $(wildcard ../src/*.cpp) $(wildcard ./*.cpp)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
 
-CCFLAGS = `sdl2-config --cflags` -g -Wall -O2 -fno-strict-aliasing -I. -I../ -I../liboggvorbis/include -I../liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS
+CCFLAGS = `sdl2-config --cflags` -g -Wall -O2 -fno-strict-aliasing -I. -I../src -I../src/liboggvorbis/include -I../src/liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS
 CXXFLAGS = $(CCFLAGS) -std=c++11 `fltk-config --cxxflags`
 CFLAGS = $(CCFLAGS) -std=gnu99 `fltk-config --cflags`
 LDFLAGS = `sdl2-config --libs` `fltk-config --ldflags` -lstdc++ -lm
@@ -23,4 +23,4 @@ $(TARGET): $(OBJFILES)
 	$(HOST)gcc $(CXXFLAGS) -c $< -o $@
 
 clean:
-	-rm -f $(TARGET) *.o ../*.o ../adplug/*.o ../libmad/*.o ../liboggvorbis/src/*.o
+	-rm -f $(TARGET) *.o ../src/*.o ../src/adplug/*.o ../src/libmad/*.o ../src/liboggvorbis/src/*.o

unix/unix.cpp

@@ -2,9 +2,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../global.h"
-#include "../../util.h"
-#include "../../palcfg.h"
+#include "../src/global.h"
+#include "../src/util.h"
+#include "../src/palcfg.h"
 
 #ifndef PAL_NO_LAUNCH_UI
 

wii/Makefile

@@ -2,12 +2,12 @@ TARGET = boot
 
 HOST = powerpc-eabi-
 
-SOURCES = . .. ../adplug
+SOURCES = . ../src ../src/adplug
 CFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.c)) 
 CPPFILES = $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.cpp))
 OFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
 
-CFLAGS = -g -Wall -O2 `sdl-config --cflags` -DGEKKO -DPAL_HAS_PLATFORM_SPECIFIC_UTILS -I.
+CFLAGS = -g -Wall -O2 `sdl-config --cflags` -DGEKKO -DPAL_HAS_PLATFORM_SPECIFIC_UTILS -I. -I../src
 CXXFLAGS = $(CFLAGS)
 LDFLAGS = `sdl-config --libs` -DGEKKO -mrvl