X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=817237a8e00137f87b936c285bbf43804ec7cc91;hb=b13285c877cedbb815dfe226115b5f7105dbf911;hp=f2000ad6bc25ea43bf51b55dcadac82b2b423e92;hpb=5354c909ec807c4ad0dc238370b9e4984888f7b6;p=libpicofe.git diff --git a/gp2x/Makefile b/gp2x/Makefile index f2000ad..817237a 100644 --- a/gp2x/Makefile +++ b/gp2x/Makefile @@ -3,12 +3,12 @@ export CROSS = arm-linux- # settings #mz80 = 1 #debug_cyclone = 1 -asm_memory = 1 +#asm_memory = 1 # TODO asm_render = 1 asm_ym2612 = 1 asm_misc = 1 asm_cdpico = 1 -asm_cdmemory = 1 +#asm_cdmemory = 1 # TODO amalgamate = 0 #profile = 1 #use_musashi = 1 @@ -64,8 +64,9 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla 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 +OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \ + pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \ + pico/misc.o pico/eeprom.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 \ @@ -120,12 +121,7 @@ DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/p all: mkdirs PicoDrive include ../common/common_arm.mak - -platform/common/menu.o : revision.h - -revision.h: - @echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp - @diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@ +include ../common/revision.mak # partial linking helps profiled builds due to section merging PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a @@ -157,8 +153,9 @@ ifeq ($(VER),) $(error need VER) endif endif +CODE940 = code940/pico940_v3.bin -rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.png ../game_def.cfg \ +rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt PicoDrive.png ../game_def.cfg \ warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko zip -9 -j ../../PicoDrive_$(VER).zip $^ zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt @@ -167,6 +164,6 @@ rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.png ../ zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3 rm -rf bin_to_cso_mp3 -code940/code940.bin: +$(CODE940): make -C code940/