X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=59a7c1562fee590a37dfd14cb616d4992e8b40cc;hb=b4008282e58f55013aa5b9167ed196bf7c91b704;hp=602e4f62e3a84cfd30bd4a855a4d7c681adfd8a6;hpb=8dfb9fd5df1ccef9f8aba43cfed8be82c822f512;p=libpicofe.git diff --git a/gp2x/Makefile b/gp2x/Makefile index 602e4f6..59a7c15 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 = 0 # TODO +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,15 +53,32 @@ 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 += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/arm_utils.o \ + ../common/readpng.o ../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 - 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/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 - 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 @@ -56,18 +92,41 @@ 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 +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 # unzip -OBJS += ../../unzip/unzip.o +OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o +# debug +ifeq "$(debug_cyclone)" "1" +OBJS += ../../Pico/Debug.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 endif @@ -80,120 +139,109 @@ DEFINC += -D_USE_DRZ80 OBJS += ../../cpu/DrZ80/drz80.o endif -all: PicoDrive.gpe code940.bin -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\\ +all: PicoDrive.gpe + +PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a + @echo ">>>" $@ + $(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map +ifeq ($(DEBUG),) + $(STRIP) $@ endif -up: # up940 - @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/ +up: PicoDrive.gpe + @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/ # @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\ -up940: - @cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/ - -# @cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\ - -testrefr.gpe : test.o gp2x.o asmutils.o - @echo $@ - @$(GCC) $(COPT) $^ $(PRELIBS) -o $@ - @$(STRIP) $@ .c.o: - @echo $< - @$(GCC) $(COPT) $(DEFINC) -c $< -o $@ + @echo ">>>" $< + $(GCC) $(COPT) $(DEFINC) -c $< -o $@ .s.o: - @echo $< - @$(GCC) $(COPT) $(DEFINC) -c $< -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 $@ + @echo ">>>" $< + $(AS) $(ASOPT) $< -o $@ ../../Pico/draw2_asm.o : ../../Pico/Draw2.s - @echo $< - @$(AS) $(ASOPT) $< -o $@ + @echo ">>>" $< + $(AS) $(ASOPT) $< -o $@ ../../Pico/memory_asm.o : ../../Pico/Memory.s - @echo $< - @$(AS) $(ASOPT) $< -o $@ + @echo ">>>" $< + $(AS) $(ASOPT) $< -o $@ ../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s - @echo $< - @$(AS) $(ASOPT) $< -o $@ + @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 : @echo building Cyclone... - @make -C ../../cpu/Cyclone/proj -f Makefile.linux - + @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h -# stuff for 940 core +../../cpu/musashi/m68kops.c : + @make -C ../../cpu/musashi -# 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 -# 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 +# build helix libs +../common/helix/helix_mp3.a: + make -C ../common/helix -code940.bin : code940.gpe - @echo $@ - @$(OBJCOPY) -O binary $< $@ +readme.txt: ../../tools/textfilter ../base_readme.txt + ../../tools/textfilter ../base_readme.txt $@ GP2X -code940.gpe : $(OBJS940) - @echo $@ - @$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ - -940ym2612.o : ../../Pico/sound/ym2612.c - @echo $@ - @$(GCC) $(COPT_COMMON) -mtune=arm940t $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@ +../../tools/textfilter: ../../tools/textfilter.c + make -C ../../tools/ textfilter # cleanup -clean: clean_pd clean_940 -tidy: tidy_pd tidy_940 - -clean_pd: tidy_pd - @$(RM) PicoDrive.gpe -tidy_pd: - @$(RM) $(OBJS) +clean: tidy + $(RM) PicoDrive.gpe +tidy: + $(RM) $(OBJS) # @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean -clean_940: tidy_940 - @$(RM) code940.bin -tidy_940: - @$(RM) code940.gpe $(OBJS940) clean_prof: find ../.. -name '*.gcno' -delete find ../.. -name '*.gcda' -delete -# 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_v2.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 $@