X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=6de8dd9d1fe393c132e302f8cc92d8d27a5d110f;hb=41397701210c08b9d25ca66cbe372c7ed86d6927;hp=df197729a38a88ff6928eaacf3a9e8b92c89067d;hpb=bcd94522e8afb8d4b266f241adfd2e9aea111904;p=picodrive.git diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile index df19772..6de8dd9 100644 --- a/platform/gp2x/Makefile +++ b/platform/gp2x/Makefile @@ -1,8 +1,4 @@ - -# 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- # settings #mz80 = 1 @@ -16,6 +12,7 @@ asm_cdmemory = 1 amalgamate = 0 #profile = 1 #use_musashi = 1 +use_sh2mame = 1 #up = 1 @@ -31,11 +28,10 @@ else use_cyclone = 1 endif -DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X # -DBENCHMARK +DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK CFLAGS += -Wall -Winline ifeq ($(DEBUG),) -# -ftracer # TODO measure impact -CFLAGS += -O3 -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math +CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math else CFLAGS += -ggdb endif @@ -55,7 +51,7 @@ LD = $(CROSS)ld OBJCOPY = $(CROSS)objcopy # frontend -OBJS += soc.o soc_mmsp2.o soc_pollux.o pollux_set.o emu.o in_gp2x.o plat.o warm.o +OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.o # 940 core control OBJS += 940ctl.o @@ -63,19 +59,22 @@ OBJS += 940ctl.o OBJS += platform/common/emu.o platform/common/menu.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/common/main.o \ - platform/linux/sndout_oss.o platform/linux/plat.o + platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.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 +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 \ pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o endif +# Pico - 32X +OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o # Pico - Pico OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o # Pico - carthw @@ -88,11 +87,11 @@ OBJS += pico/sound/sound.o endif OBJS += pico/sound/mix_arm.o OBJS += pico/sound/sn76496.o pico/sound/ym2612.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 @@ -104,9 +103,8 @@ 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 +OBJS += pico/m68kif_cyclone.o 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 @@ -114,21 +112,37 @@ else DEFINC += -D_USE_DRZ80 OBJS += cpu/DrZ80/drz80.o endif +OBJS += cpu/sh2/sh2.o +ifeq "$(use_sh2mame)" "1" +OBJS += cpu/sh2/mame/sh2pico.o +else +endif +OBJS += cpu/drc/cmn.o +OBJS += cpu/drc/cmn_arm.o 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 platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \ + pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \ + cpu/mz80 cpu/DrZ80 cpu/sh2/mame cpu/drc all: mkdirs PicoDrive include ../common/common_arm.mak +include ../common/revision.mak + +# partial linking helps profiled builds due to section merging +PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a + $(LD) -r -o $@ $^ -PicoDrive : $(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) $^ -lm -lpng -Wl,-Map=$@.map ifeq ($(DEBUG),) $(STRIP) $@ endif @@ -150,15 +164,17 @@ ifeq ($(VER),) $(error need VER) endif endif +CODE940 = code940/pico940_v3.bin -rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg - zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o +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 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: +$(CODE940): make -C code940/