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

diff --git a/gp2x/Makefile b/gp2x/Makefile
index c634c3d..b032133 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,24 +1,43 @@
 
 # you may or may not need to change this
 #devkit_path = x:/stuff/dev/devkitgp2x/
-devkit_path = /usr/local/devkitPro/devkitGP2X/
-lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/
-CROSS = arm-linux-
+export CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
-dprint = 1
 #mz80 = 1
 #debug_cyclone = 1
 asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
+asm_misc = 1
+asm_cdpico = 1
+asm_cdmemory = 1
+amalgamate = 0
 #profile = 1
 #use_musashi = 1
 #up = 1
 
-DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
+
+ifeq "$(debug_cyclone)" "1"
+use_cyclone = 1
+use_musashi = 1
+endif
+ifeq "$(use_musashi)" "1"
+asm_cdpico = 0
+asm_memory = 0
+asm_cdmemory = 0
+else
+use_cyclone = 1
+endif
+
+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
@@ -34,158 +53,206 @@ 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 gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 # 940 core control
-OBJS += 940ctl_ym2612.o
+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
-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
+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 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/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
+endif
+ifeq "$(asm_cdpico)" "1"
+DEFINC += -D_ASM_CD_PICO_C
+OBJS += Pico/cd/pico_asm.o
 endif
+ifeq "$(asm_cdmemory)" "1"
+DEFINC += -D_ASM_CD_MEMORY_C
+OBJS += Pico/cd/memory_asm.o
+endif
+
 # Pico - sound
-OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+ifneq "$(amalgamate)" "1"
+OBJS += Pico/sound/sound.o
+endif
+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
+OBJS += unzip/unzip.o unzip/unzip_stream.o
+# debug
+ifeq "$(debug_cyclone)" "1"
+OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o
+endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += _build\m68kcpu.o _build\m68kopac.o _build\m68kopdm.o _build\m68kopnz.o _build\m68kops.o
-else
+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
 
-all: PicoDrive.gpe code940.bin
+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: mkdirs PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS)
-	@echo $@
-	@$(GCC) $(COPT) $(OBJS) $(PRELIBS) -lm -o $@
-	@$(STRIP) $@
-#	@$(GCC) $(COPT) $(OBJS) $(PRELIBS) -lm -o PicoDrive_.gpe
-#	@gpecomp PicoDrive_.gpe $@
-ifeq "$(up)" "1"
-	@cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
+	@echo ">>>" $@
+	$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
+ifeq ($(DEBUG),)
+	$(STRIP) $@
 endif
 
-up: up940
-	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
-up940:
-	@cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
+up: PicoDrive.gpe
+	@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/
 
-testrefr.gpe : test.o gp2x.o asmutils.o
-	@echo $@
-	@$(GCC) $(COPT) $^ $(PRELIBS) -o $@
-	@$(STRIP) $@
+#	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
-.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 $@
+# 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
 
-# build Cyclone
-../../cpu/Cyclone/proj/Cyclone.s :
-	@echo building Cyclone...
-	@make -C ../../cpu/Cyclone/proj -f Makefile.linux
 
+clean_prof:
+	find ../.. -name '*.gcno' -delete
+	find ../.. -name '*.gcda' -delete
 
-# stuff for 940 core
 
-# init, emu_control, emu
-OBJS940 += 940init.o 940.o 940ym2612.o
-# the asm code seems to be faster when run on 920, but not on 940 for some reason
-# OBJS940 += ../../Pico/sound/ym2612_asm.o
+mkdirs:
+	mkdir -p $(DIRS)
 
-# uClibc library code
-OBJS940 += uClibc/memset.o uClibc/s_floor.o uClibc/e_pow.o uClibc/e_sqrt.o uClibc/s_fabs.o
-OBJS940 += uClibc/s_scalbn.o uClibc/s_copysign.o uClibc/k_sin.o uClibc/k_cos.o uClibc/s_sin.o
-OBJS940 += uClibc/e_rem_pio2.o uClibc/k_rem_pio2.o uClibc/e_log.o uClibc/wrappers.o
+.c.o:
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+.s.o:
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+.S.o:
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
-code940.bin : code940.gpe
-	@echo $@
-	@$(OBJCOPY) -O binary $< $@
+Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
 
-code940.gpe : $(OBJS940)
-	@echo $@
-	@$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -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 $@
 
-940ym2612.o : ../../Pico/sound/ym2612.c
-	@echo $@
-	@$(GCC) $(COPT_COMMON) -mtune=arm940t $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
+# build Cyclone
+../../cpu/Cyclone/proj/Cyclone.s :
+	@echo building Cyclone...
+	@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
 
+../../cpu/musashi/m68kops.c :
+	@make -C ../../cpu/musashi
 
-# cleanup
-clean: clean_pd clean_940
-tidy: tidy_pd tidy_940
+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
 
-clean_pd: tidy_pd
-	@$(RM) PicoDrive.gpe
-tidy_pd:
-	@$(RM) $(OBJS)
-#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
+# build helix libs
+../common/helix/helix_mp3.a:
+	make -C ../common/helix
 
-clean_940: tidy_940
-	@$(RM) code940.bin
-tidy_940:
-	@$(RM) code940.gpe $(OBJS940)
+readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ GP2X
 
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/ textfilter
 
-# test
-usbjoy.o : usbjoy.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
 
-../../Pico/Cart.o : ../../Pico/Cart.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
+# ----------- release -----------
+ifneq ($(findstring rel,$(MAKECMDGOALS)),)
+ifeq ($(VER),)
+$(error need VER)
+endif
+endif
 
-../../zlib/trees.o : ../../zlib/trees.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
+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
 
-uClibc/e_pow.o : uClibc/e_pow.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
+code940/code940.bin:
+	make -C code940/
 
-uClibc/e_sqrt.o : uClibc/e_sqrt.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@