misc gp2x tweaks

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index f2000ad..cdfea37 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,8 +1,12 @@
-export CROSS = arm-linux-\r
+CROSS ?= arm-linux-\r
 \r
 # settings\r
-#mz80 = 1\r
-#debug_cyclone = 1\r
+use_cyclone = 1\r
+#use_musashi = 1\r
+use_drz80 = 1\r
+use_sh2drc = 1\r
+#use_sh2mame = 1\r
+\r
 asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
@@ -11,24 +15,23 @@ asm_cdpico = 1
 asm_cdmemory = 1\r
 amalgamate = 0\r
 #profile = 1\r
-#use_musashi = 1\r
-#up = 1\r
+#drc_debug = 3\r
 \r
+-include Makefile.local\r
 \r
 ifeq "$(debug_cyclone)" "1"\r
 use_cyclone = 1\r
 use_musashi = 1\r
 endif\r
 ifeq "$(use_musashi)" "1"\r
+# due to CPU stop flag acces\r
 asm_cdpico = 0\r
-asm_memory = 0\r
 asm_cdmemory = 0\r
-else\r
-use_cyclone = 1\r
 endif\r
 \r
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK\r
-CFLAGS += -Wall -Winline\r
+ARCH = arm\r
+DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK\r
+CFLAGS += -Wall -Winline -I../.. -I.\r
 ifeq ($(DEBUG),)\r
 CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
@@ -41,8 +44,9 @@ ifeq "$(profile)" "2"
 CFLAGS += -fprofile-use\r
 endif\r
 CFLAGS += -mcpu=arm920t -mtune=arm920t\r
-SFLAGS = $(CFLAGS)\r
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
+LDFLAGS += -lm -lpng\r
+\r
 CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
@@ -50,7 +54,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.o\r
+OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o emu.o in_gp2x.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
@@ -64,13 +68,16 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 ifeq "$(amalgamate)" "1"\r
 OBJS += ../../picoAll.o\r
 else\r
-OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \\r
-               pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \\r
+       pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \\r
+       pico/misc.o pico/eeprom.o pico/patch.o pico/debug.o\r
 # Pico - CD\r
 OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \\r
                pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \\r
                pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
 endif\r
+# Pico - 32X\r
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o\r
 # Pico - Pico\r
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 # Pico - carthw\r
@@ -88,44 +95,23 @@ OBJS += unzip/unzip.o unzip/unzip_stream.o
 # zlib\r
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
        zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
-# debug\r
-ifeq "$(debug_cyclone)" "1"\r
-OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
-endif\r
-# CPU cores\r
-ifeq "$(use_musashi)" "1"\r
-DEFINC += -DEMU_M68K\r
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
-endif\r
-ifeq "$(use_cyclone)" "1"\r
-DEFINC += -DEMU_C68K\r
-OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
-endif\r
-ifeq "$(mz80)" "1"\r
-DEFINC += -D_USE_MZ80\r
-OBJS += cpu/mz80/mz80.o\r
-else\r
-DEFINC += -D_USE_DRZ80\r
-OBJS += cpu/DrZ80/drz80.o\r
-endif\r
+\r
+CFLAGS += $(addprefix -D,$(DEFINES))\r
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
 \r
-DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \\r
-       pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \\r
+       pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \\r
+       cpu/mz80 cpu/DrZ80 cpu/sh2/mame cpu/drc\r
 \r
 \r
 all: mkdirs PicoDrive\r
 \r
+include ../common/common.mak\r
 include ../common/common_arm.mak\r
-\r
-platform/common/menu.o : revision.h\r
-\r
-revision.h:\r
-       @echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp\r
-       @diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@\r
+include ../common/revision.mak\r
 \r
 # partial linking helps profiled builds due to section merging\r
 PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
@@ -135,7 +121,7 @@ PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 # also libm on F100 is not compatible\r
 PicoDrive : PicoDrive.o\r
        @echo ">>>" $@\r
-       $(CC) -static -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=$@.map\r
+       $(CC) -static -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=$@.map\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
 endif\r
@@ -157,8 +143,9 @@ ifeq ($(VER),)
 $(error need VER)\r
 endif\r
 endif\r
+CODE940 = code940/pico940_v3.bin\r
 \r
-rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.png ../game_def.cfg \\r
+rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt PicoDrive.png ../game_def.cfg \\r
                warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko\r
        zip -9 -j ../../PicoDrive_$(VER).zip $^\r
        zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
@@ -167,6 +154,6 @@ rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.png ../
        zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3\r
        rm -rf bin_to_cso_mp3\r
 \r
-code940/code940.bin:\r
+$(CODE940):\r
        make -C code940/\r
 \r