giz rc1 release

[picodrive.git] / platform / gp2x / Makefile

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 65565f1..5c903b1 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -1,7 +1,7 @@
 \r
 # you may or may not need to change this\r
 #devkit_path = x:/stuff/dev/devkitgp2x/\r
-CROSS = arm-linux-\r
+export CROSS = arm-linux-\r
 #CROSS = $(devkit_path)bin/arm-linux-\r
 \r
 # settings\r
@@ -58,7 +58,8 @@ OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 OBJS += 940ctl.o\r
 \r
 # common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \\r
+       ../common/readpng.o ../common/mp3_helix.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
@@ -111,8 +112,6 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
        ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
 # unzip\r
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
-# mp3\r
-OBJS += mp3.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
 OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o\r
@@ -138,7 +137,7 @@ endif
 \r
 all: PicoDrive.gpe\r
 \r
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a\r
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a\r
        @echo $@\r
        @$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
 ifeq ($(DEBUG),)\r
@@ -206,8 +205,8 @@ testrefr.gpe : test.o gp2x.o
 \r
 \r
 # build helix libs\r
-helix/helix_mp3.a:\r
-       make -C helix\r
+../common/helix/helix_mp3.a:\r
+       make -C ../common/helix\r
 \r
 \r
 # cleanup\r