X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=b0321337d03fe28aceb392fcefc48106c9eb5ef7;hb=b846453101c070b93938dd2224f0cca130a55e8c;hp=0eee0eb2a4b85ae81259d7a7e7942dbdf589db75;hpb=263b3b7c04adb427e87b07d18f8fe6dc43061619;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 0eee0eb..b032133 100644
--- a/gp2x/Makefile
+++ b/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
@@ -31,8 +31,13 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -Wall -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
+COPT_COMMON = -static -Wall -Winline
+ifeq ($(DEBUG),)
+COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+else
+COPT_COMMON += -ggdb
+endif
 ifeq "$(profile)" "1"
 COPT_COMMON += -fprofile-generate
 endif
@@ -48,98 +53,105 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 # 940 core control
 OBJS += 940ctl.o
 
+# common
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
+	platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o
+
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
 else
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
-		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
-		../../Pico/Patch.o
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \
+		Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.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/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
+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/cue.o Pico/cd/gfx_cd.o \
+		Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
 endif
+# Pico - Pico
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o
+# Pico - carthw
+OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
+		Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o
 
 # asm stuff
 ifeq "$(asm_render)" "1"
 DEFINC += -D_ASM_DRAW_C
-OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o
+OBJS += Pico/draw_asm.o Pico/draw2_asm.o
 endif
 ifeq "$(asm_memory)" "1"
 DEFINC += -D_ASM_MEMORY_C
-OBJS += ../../Pico/memory_asm.o
+OBJS += Pico/memory_asm.o
 endif
 ifeq "$(asm_ym2612)" "1"
 DEFINC += -D_ASM_YM2612_C
-OBJS += ../../Pico/sound/ym2612_asm.o
+OBJS += Pico/sound/ym2612_asm.o
 endif
 ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C
-OBJS += ../../Pico/misc_asm.o
-OBJS += ../../Pico/cd/misc_asm.o
+OBJS += Pico/misc_asm.o
+OBJS += Pico/cd/misc_asm.o
 endif
 ifeq "$(asm_cdpico)" "1"
 DEFINC += -D_ASM_CD_PICO_C
-OBJS += ../../Pico/cd/pico_asm.o
+OBJS += Pico/cd/pico_asm.o
 endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINC += -D_ASM_CD_MEMORY_C
-OBJS += ../../Pico/cd/memory_asm.o
+OBJS += Pico/cd/memory_asm.o
 endif
 
 # Pico - sound
 ifneq "$(amalgamate)" "1"
-OBJS += ../../Pico/sound/sound.o
+OBJS += Pico/sound/sound.o
 endif
-OBJS += ../../Pico/sound/mix_asm.o
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += Pico/sound/mix_asm.o
+OBJS += 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
+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 ../../unzip/unzip_stream.o
-# mp3
-OBJS += mp3.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # debug
 ifeq "$(debug_cyclone)" "1"
-OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o
+OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o
 endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 endif
 ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 endif
 # drz80/mz80
 ifeq "$(mz80)" "1"
 DEFINC += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+OBJS += cpu/mz80/mz80.o
 else
 DEFINC += -D_USE_DRZ80
-OBJS += ../../cpu/DrZ80/drz80.o
+OBJS += cpu/DrZ80/drz80.o
 endif
 
+vpath %.c = ../..
+vpath %.s = ../..
+vpath %.S = ../..
+DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+	zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
 
-all: PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
-	@echo $@
-	@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
+all: mkdirs PicoDrive.gpe
+
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
+	@echo ">>>" $@
+	$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
-	@$(STRIP) $@
-endif
-#	@$(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\\
+	$(STRIP) $@
 endif
 
 up: PicoDrive.gpe
@@ -147,46 +159,62 @@ up: PicoDrive.gpe
 
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
+# cleanup
+clean: tidy
+	$(RM) PicoDrive.gpe
+tidy:
+	$(RM) $(OBJS)
+#	rm -rf $(DIRS) # don't clean, gcda may be there
+#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
+
+
+clean_prof:
+	find ../.. -name '*.gcno' -delete
+	find ../.. -name '*.gcda' -delete
+
 
-testrefr.gpe : test.o gp2x.o asmutils.o
-	@echo $@
-	@$(GCC) $(COPT) $^ -o $@
-	@$(STRIP) $@
+mkdirs:
+	mkdir -p $(DIRS)
 
 .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 $<
-	@$(AS) $(ASOPT) $< -o $@
-../../Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
-../../Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -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 $@
-../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+.S.o:
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+
+Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
+
+Pico/draw_asm.o : ../../Pico/Draw.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
+Pico/draw2_asm.o : ../../Pico/Draw2.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
+Pico/memory_asm.o : ../../Pico/Memory.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -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 $@
+Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
+Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
+Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :
@@ -196,23 +224,19 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
 
+Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
+Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
 
 # 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
 
-# cleanup
-clean: tidy
-	@$(RM) PicoDrive.gpe
-tidy:
-	@$(RM) $(OBJS)
-#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
-
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/ textfilter
 
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
 
 # ----------- release -----------
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)
@@ -221,9 +245,13 @@ $(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_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
+	mkdir bin_to_cso_mp3
+	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
+	zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3
+	rm -rf bin_to_cso_mp3
 
 code940/code940.bin:
 	make -C code940/