more Pandora porting work

[libpicofe.git] / pandora / Makefile

diff --git a/pandora/Makefile b/pandora/Makefile
index ffa1d72..016a76f 100644 (file)
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -49,7 +49,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += pandora.o main.o platform/gp2x/menu.o platform/gp2x/usbjoy.o platform/gp2x/emu.o\r
+OBJS += pandora.o main.o emu.o platform/gp2x/menu.o platform/gp2x/usbjoy.o\r
 \r
 # common\r
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
@@ -141,7 +141,7 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound
 \r
 all: mkdirs PicoDrive\r
 \r
-PicoDrive : $(OBJS) ../common/helix/helix_mp3.a\r
+PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
        $(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng\r
 ifeq ($(DEBUG),)\r
@@ -218,8 +218,8 @@ Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
 Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h\r
 \r
 # build helix libs\r
-../common/helix/helix_mp3.a:\r
-       make -C ../common/helix\r
+../common/helix/$(CROSS)helix-mp3.a:\r
+       make -C ../common/helix clean all\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ GP2X\r