X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2FMakefile;h=6581e4ffb213cbe7826a7fd1249bf5727028bac9;hb=7eed09b34f1d37d8f4e476c82d13b63322ea8185;hp=ff7906a63219e30f9bcaa8f8c376b24e1255c25e;hpb=ea8c405fa721a8658b1f7c51cf6238ba2bba8a17;p=picodrive.git

diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile
index ff7906a..6581e4f 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
@@ -15,9 +15,9 @@ amalgamate = 0
 
 
 DEFINC = -I../.. -I. -D__GIZ__ -D_UNZIP_SUPPORT -DNO_SYNC
-COPT_COMMON = -static -Wall -Winline
+COPT_COMMON = -Wall -Winline
 ifeq ($(DEBUG),)
-COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+COPT_COMMON += -O2 -ftracer -fomit-frame-pointer -fstrict-aliasing -ffast-math
 else
 COPT_COMMON += -ggdb
 endif
@@ -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
@@ -102,56 +101,66 @@ DEFINC += -D_USE_DRZ80
 OBJS += ../../cpu/DrZ80/drz80.o
 
 
-all: PicoDrive.exe
+all: PicoDrive.exe readme.txt
 
-PicoDrive.exe : $(OBJS)
-	@echo $@
-	@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map
+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"
 ifeq ($(DEBUG),)
-	@$(STRIP) $@
+	$(STRIP) $@
 endif
 
 
 .c.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 #.s.o:
 #	@echo $<
 #	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
 ../../Pico/draw_asm.o : ../../Pico/Draw.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/misc_asm.o : ../../Pico/Misc.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 ../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-	@echo $<
+	@echo ">>>" $@
 	@$(AS) $(ASFLAGS) $< -o $@
 
 # build Cyclone
-../../cpu/Cyclone/proj/Cyclone.s :
+../../cpu/Cyclone/proj/Cyclone.s:
 	@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
+
+readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ GIZ
+
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/ textfilter
 
 
 # cleanup
@@ -181,7 +190,9 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll ../readme.txt config.txt
+rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll readme.txt
 	zip -9 -j ../../PicoDrive_$(VER).zip $^
+	ln -s ../gp2x/skin skin
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
+	rm skin