X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=030bab67d5b0cc325dae3dc08c08d5cea6dc58a8;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=ea86f6bab2192da730314576143db0bba7059c90;hpb=5a31ef07776f196cbf25748eee78da65b2b89928;p=libpicofe.git diff --git a/gp2x/Makefile b/gp2x/Makefile index ea86f6b..030bab6 100644 --- a/gp2x/Makefile +++ b/gp2x/Makefile @@ -1,52 +1,44 @@ - -# you may or may not need to change this -#devkit_path = x:/stuff/dev/devkitgp2x/ -export CROSS = arm-linux- -#CROSS = $(devkit_path)bin/arm-linux- +CROSS ?= arm-linux- # settings -#mz80 = 1 -#debug_cyclone = 1 +use_cyclone = 1 +#use_musashi = 1 +use_drz80 = 1 +use_sh2drc = 1 +#use_sh2mame = 1 + asm_memory = 1 asm_render = 1 asm_ym2612 = 1 asm_misc = 1 asm_cdpico = 1 asm_cdmemory = 1 -amalgamate = 0 +asm_32xdraw = 1 #profile = 1 -#use_musashi = 1 -#up = 1 +#drc_debug = 3 +-include Makefile.local ifeq "$(debug_cyclone)" "1" use_cyclone = 1 use_musashi = 1 endif ifeq "$(use_musashi)" "1" +# due to CPU stop flag acces asm_cdpico = 0 -asm_memory = 0 asm_cdmemory = 0 -else -use_cyclone = 1 endif -DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X # -DBENCHMARK -COPT_COMMON = -static -Wall -Winline +ARCH = arm +DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK +CFLAGS += -Wall -Winline -I../.. -I. 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 -ifeq "$(profile)" "2" -COPT_COMMON += -fprofile-use +CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math endif -CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t -SFLAGS = $(CFLAGS) +CFLAGS += -mcpu=arm920t -mtune=arm920t ASFLAGS = -mcpu=arm920t -mfloat-abi=soft +LDFLAGS += -lm -lpng + CC = $(CROSS)gcc STRIP = $(CROSS)strip AS = $(CROSS)as @@ -54,90 +46,59 @@ LD = $(CROSS)ld OBJCOPY = $(CROSS)objcopy # frontend -# TODO: clean cpuctrl -OBJS += main.o gp2x.o emu.o in_gp2x.o plat.o squidgehack.o cpuctrl.o +OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o emu.o in_gp2x.o # 940 core control OBJS += 940ctl.o +# ARM stuff +OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o +OBJS += pico/sound/mix_arm.o + # common -OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \ +OBJS += platform/common/emu.o platform/common/menu_pico.o platform/common/fonts.o platform/common/config.o \ platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \ - platform/common/mp3_helix.o platform/common/input.o \ - platform/linux/sndout_oss.o platform/linux/plat.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 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 - -# Pico - sound -ifneq "$(amalgamate)" "1" -OBJS += pico/sound/sound.o -endif -OBJS += pico/sound/mix_arm.o -OBJS += pico/sound/sn76496.o pico/sound/ym2612.o + platform/common/mp3_helix.o platform/common/input.o platform/common/main.o platform/common/mp3.o \ + platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o + +# unzip +OBJS += unzip/unzip.o unzip/unzip_stream.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 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 += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o -endif -ifeq "$(use_cyclone)" "1" -DEFINC += -DEMU_C68K -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 -else -DEFINC += -D_USE_DRZ80 -OBJS += cpu/DrZ80/drz80.o -endif vpath %.c = ../.. vpath %.s = ../.. vpath %.S = ../.. -DIRS = platform platform/gp2x platform/linux 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 + +DIRS += platform/gp2x platform/linux zlib unzip -all: mkdirs PicoDrive.gpe +all: mkdirs PicoDrive +include ../common/common.mak include ../common/common_arm.mak +include ../common/revision.mak + +CFLAGS += $(addprefix -D,$(DEFINES)) + +# partial linking helps profiled builds due to section merging +PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a + $(LD) -r -o $@ $^ -PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a +# still using static, dynamic linking slows Wiz 1-10% +# also libm on F100 is not compatible +PicoDrive : PicoDrive.o @echo ">>>" $@ - $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map + $(CC) -static -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=$@.map ifeq ($(DEBUG),) $(STRIP) $@ endif -up: PicoDrive.gpe - @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/ +up: PicoDrive + @cp -v PicoDrive /mnt/gp2x/mnt/sd/emus/PicoDrive/ clean: tidy - $(RM) PicoDrive.gpe + $(RM) PicoDrive tidy: $(RM) $(OBJS) @@ -145,20 +106,23 @@ readme.txt: ../../tools/textfilter ../base_readme.txt ../../tools/textfilter ../base_readme.txt $@ GP2X # ----------- release ----------- -ifneq ($(findstring rel,$(MAKECMDGOALS)),) -ifeq ($(VER),) -$(error need VER) -endif -endif - -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: +VER ?= $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g') +CODE940 = code940/pico940_v3.bin + +rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \ + PicoDrive.png PicoDrive_s.png PicoDrive_t.png \ + warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko \ + ../../pico/carthw.cfg + mkdir -p out/PicoDrive/skin/ + cp $^ out/PicoDrive/ + cp PicoDrive.ini out/ + cp skin/*.png out/PicoDrive/skin/ + cp skin/*.txt out/PicoDrive/skin/ + mkdir out/bin_to_cso_mp3 + cp ../../tools/bin_to_cso_mp3/* out/bin_to_cso_mp3/ + cd out && zip -9 -r ../../../PicoDrive_$(VER).zip * + rm -rf out + +$(CODE940): make -C code940/