X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=c5d339f592e18b8a430ac1d5bf0ef7e8942eb38d;hb=3a81ecde1cf95372e27a3e6ca6f9c2cccc86e272;hp=11e67490cdbe1e000aefa70d475f15b5bcefd120;hpb=42c7b14797fad5ad8adc822e8d0cebf326eb620b;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 11e6749..c5d339f 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -11,6 +11,7 @@ dprint = 1
 asm_memory = 0	# TODO
 asm_render = 1
 asm_ym2612 = 1
+asm_misc = 1
 #profile = 1
 #use_musashi = 1
 #up = 1
@@ -32,15 +33,16 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o
+OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o
 # 940 core control
-OBJS += 940ctl_ym2612.o
+OBJS += 940ctl.o
 # Pico
 OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \
 		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o
 # Pico - CD
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \
-		../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o
+		../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \
+		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o
 # asm stuff
 ifeq "$(asm_render)" "1"
 DEFINC += -D_ASM_DRAW_C
@@ -54,13 +56,20 @@ ifeq "$(asm_ym2612)" "1"
 DEFINC += -D_ASM_YM2612_C
 OBJS += ../../Pico/sound/ym2612_asm.o
 endif
+ifeq "$(asm_misc)" "1"
+DEFINC += -D_ASM_MISC_C
+OBJS += ../../Pico/misc_asm.o
+endif
 # Pico - sound
+OBJS += ../../Pico/sound/mix_asm.o
 OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
 # zlib
 OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \
 	../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
 # unzip
 OBJS += ../../unzip/unzip.o
+# mp3
+OBJS += mp3.o
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
@@ -78,19 +87,20 @@ DEFINC += -D_USE_DRZ80
 OBJS += ../../cpu/DrZ80/drz80.o
 endif
 
+
 all: PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS)
+PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
 	@echo $@
-	@$(GCC) $(COPT) $(OBJS) $(PRELIBS) -lm -o $@
+	@$(GCC) -o $@ $(COPT) $^ -lm
 	@$(STRIP) $@
-#	@$(GCC) $(COPT) $(OBJS) $(PRELIBS) -lm -o PicoDrive_.gpe
+#	@$(GCC) $(COPT) $(OBJS) -lm -o PicoDrive_.gpe
 #	@gpecomp PicoDrive_.gpe $@
 ifeq "$(up)" "1"
 	@cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 endif
 
-up:
+up: PicoDrive.gpe
 	@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/
 
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
@@ -98,7 +108,7 @@ up:
 
 testrefr.gpe : test.o gp2x.o asmutils.o
 	@echo $@
-	@$(GCC) $(COPT) $^ $(PRELIBS) -o $@
+	@$(GCC) $(COPT) $^ -o $@
 	@$(STRIP) $@
 
 .c.o:
@@ -120,12 +130,22 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
+../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
+../../Pico/misc_asm.o : ../../Pico/misc.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :
 	@echo building Cyclone...
 	@make -C ../../cpu/Cyclone/proj -f Makefile.linux
 
+# build helix libs
+helix/helix_mp3.a:
+	make -C helix
+
 
 # cleanup
 clean: tidy
@@ -139,6 +159,20 @@ clean_prof:
 	find ../.. -name '*.gcno' -delete
 	find ../.. -name '*.gcda' -delete
 
+# ----------- release -----------
+ifneq ($(findstring rel,$(MAKECMDGOALS)),)
+ifeq ($(VER),)
+$(error need VER)
+endif
+endif
+
+rel: PicoDrive.gpe code940/code940.bin ../readme.txt config.txt
+	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
+
+code940/code940.bin:
+	make -C code940/
+
+
 # test
 usbjoy.o : usbjoy.c
 	@echo $<