X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=c98d6a9eee2fe5c6c2715dfd7d9f49c49354a20e;hb=6cadc2da0070781cf2d8fcff84265d3ca1f423b9;hp=d6ba1d5bc191ee32a47bb084a39c5c2c8241e185;hpb=7336a99a49268970e0df89d15210b98dd7798f1e;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index d6ba1d5..c98d6a9 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -8,11 +8,12 @@ CROSS = arm-linux-
 dprint = 1
 #mz80 = 1
 #debug_cyclone = 1
-asm_memory = 0	# TODO
+asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
+asm_cdmemory = 1
 #profile = 1
 #use_musashi = 1
 #up = 1
@@ -61,11 +62,16 @@ endif
 ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C
 OBJS += ../../Pico/misc_asm.o
+OBJS += ../../Pico/cd/misc_asm.o
 endif
 ifeq "$(asm_cdpico)" "1"
 DEFINC += -D_ASM_CD_PICO_C
 OBJS += ../../Pico/cd/pico_asm.o
 endif
+ifeq "$(asm_cdmemory)" "1"
+DEFINC += -D_ASM_CD_MEMORY_C
+OBJS += ../../Pico/cd/memory_asm.o
+endif
 # Pico - sound
 OBJS += ../../Pico/sound/mix_asm.o
 OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
@@ -79,7 +85,8 @@ OBJS += mp3.o
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += _build\m68kcpu.o _build\m68kopac.o _build\m68kopdm.o _build\m68kopnz.o _build\m68kops.o
+OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o
+OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
 else
 DEFINC += -DEMU_C68K
 OBJS += ../../cpu/Cyclone/proj/Cyclone.o
@@ -147,6 +154,12 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
+../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
+../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :