giz rc1 release

[picodrive.git] / platform / gizmondo / Makefile

diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile
index 080219c..b5eaaac 100644 (file)
--- a/platform/gizmondo/Makefile
+++ b/platform/gizmondo/Makefile
@@ -1,6 +1,6 @@
 \r
 # you may or may not need to change this\r
-CROSS = /opt/cegcc/arm-wince-cegcc/bin/\r
+export CROSS = /opt/cegcc/arm-wince-cegcc/bin/\r
 \r
 # settings\r
 asm_memory = 1\r
@@ -38,7 +38,8 @@ LD = $(CROSS)ld
 OBJS += main.o emu.o menu.o giz.o asm_utils.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
@@ -91,8 +92,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
 # CPU cores\r
 # Cyclone\r
 DEFINC += -DEMU_C68K\r
@@ -104,7 +103,7 @@ OBJS += ../../cpu/DrZ80/drz80.o
 \r
 all: PicoDrive.exe\r
 \r
-PicoDrive.exe : $(OBJS)\r
+PicoDrive.exe : $(OBJS) ../common/helix/helix_mp3.a\r
        @echo ">>>" $@\r
        $(GCC) -o $@ -static $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map 2>&1 | \\r
                grep -v ".idata$$4" # | grep -v "supports interworking, whereas"\r
@@ -153,6 +152,9 @@ endif
        @echo building Cyclone...\r
        @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
 \r
+# build helix libs\r
+../common/helix/helix_mp3.a:\r
+       make -C ../common/helix\r
 \r
 \r
 # cleanup\r