X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=595db535dac8e3a40ddeeeb65ce36bb331f6049e;hb=9d917eea21607c7c239d4b0cd850d660c0c8e4c5;hp=65565f189bb703f846ef819860b8d14c31f56609;hpb=ea8c405fa721a8658b1f7c51cf6238ba2bba8a17;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 65565f1..595db53 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -1,7 +1,7 @@
 
 # you may or may not need to change this
 #devkit_path = x:/stuff/dev/devkitgp2x/
-CROSS = arm-linux-
+export CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
@@ -58,7 +58,8 @@ OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 OBJS += 940ctl.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"
@@ -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
 # unzip
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
-# mp3
-OBJS += mp3.o
 # debug
 ifeq "$(debug_cyclone)" "1"
 OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o
@@ -138,7 +137,7 @@ endif
 
 all: PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
 	@echo $@
 	@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
@@ -206,8 +205,14 @@ testrefr.gpe : test.o gp2x.o
 
 
 # build helix libs
-helix/helix_mp3.a:
-	make -C helix
+../common/helix/helix_mp3.a:
+	make -C ../common/helix
+
+readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ GP2X
+
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/ textfilter
 
 
 # cleanup
@@ -229,7 +234,7 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png
+rel: PicoDrive.gpe code940/pico940.bin readme.txt PicoDrive.man.txt PicoDrive.png
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt