X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fgizmondo%2FMakefile;fp=platform%2Fgizmondo%2FMakefile;h=b5eaaacfff6462c9ee9d3951c88160018e029f8a;hb=da42200b24749eee63cccf49d87781b861146e9f;hp=080219ce8bffecae7e69b37e035da69f5223bbc5;hpb=a8869ad1e809e6cacd6141fa7e9c86d349b0c0be;p=picodrive.git

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