1.32 release

[picodrive.git] / platform / gp2x / Makefile

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