extracted OSS code to sndout_oss_*, BTN->PBTN, refactoring

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index b8bf448..ed4f928 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -54,13 +54,14 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o asm_utils.o\r
+OBJS += main.o menu.o gp2x.o emu.o squidgehack.o cpuctrl.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
 # common\r
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
-       platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o\r
+       platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \\r
+       platform/common/mp3_helix.o platform/linux/usbjoy.o platform/linux/sndout_oss.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
@@ -115,8 +116,8 @@ endif
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
-DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
-       zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \\r
+       pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
 \r
 \r
 all: mkdirs PicoDrive.gpe\r