X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fgp2x%2FMakefile;h=329da367ceeafeb39985bd99da0f2d9153fde96e;hb=5e128c6d279ac90f7b6078740ab1d0ba516969b9;hp=817237a8e00137f87b936c285bbf43804ec7cc91;hpb=45f2f245f51ef0c0d37df3c998595c132bfcaffa;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 817237a..329da36 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -3,12 +3,12 @@ export CROSS = arm-linux-
 # settings
 #mz80 = 1
 #debug_cyclone = 1
-#asm_memory = 1 # TODO
+asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
-#asm_cdmemory = 1 # TODO
+asm_cdmemory = 1
 amalgamate = 0
 #profile = 1
 #use_musashi = 1
@@ -72,6 +72,8 @@ 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 - Pico
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - carthw
@@ -100,7 +102,7 @@ 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
 ifeq "$(mz80)" "1"
 DEFINC += -D_USE_MZ80
@@ -114,8 +116,9 @@ 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
 
 
 all: mkdirs PicoDrive