Finish migrating to new mem handling. Make carthw db external.

[picodrive.git] / platform / gp2x / Makefile

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 6e899f2..817237a 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -3,12 +3,12 @@ export CROSS = arm-linux-
 # settings\r
 #mz80 = 1\r
 #debug_cyclone = 1\r
-asm_memory = 1\r
+#asm_memory = 1 # TODO\r
 asm_render = 1\r
 asm_ym2612 = 1\r
 asm_misc = 1\r
 asm_cdpico = 1\r
-asm_cdmemory = 1\r
+#asm_cdmemory = 1 # TODO\r
 amalgamate = 0\r
 #profile = 1\r
 #use_musashi = 1\r
@@ -64,8 +64,9 @@ 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
@@ -120,6 +121,7 @@ DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/p
 all: mkdirs PicoDrive\r
 \r
 include ../common/common_arm.mak\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
@@ -151,8 +153,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
@@ -161,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\r
        rm -rf bin_to_cso_mp3\r
 \r
-code940/code940.bin:\r
+$(CODE940):\r
        make -C code940/\r
 \r