cd: switch to CD drive emu code from genplus

[picodrive.git] / platform / common / common.mak

diff --git a/platform/common/common.mak b/platform/common/common.mak
index 17e540f..fb59ecf 100644 (file)
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -30,6 +30,13 @@ SRCS_COMMON += $(R)cpu/debug.c
  LDFLAGS += -lreadline
  endif
 endif
+ifeq "$(cpu_cmp)" "1"
+ifdef cpu_cmp_w
+DEFINES += CPU_CMP_W
+else
+DEFINES += CPU_CMP_R
+endif # cpu_cmp_w
+endif
 ifeq "$(pprof)" "1"
 DEFINES += PPROF
 SRCS_COMMON += $(R)platform/linux/pprof.c
@@ -56,7 +63,7 @@ SRCS_COMMON += $(R)pico/cd/misc_arm.s
 endif
 ifeq "$(asm_cdpico)" "1"
 DEFINES += _ASM_CD_PICO_C
-SRCS_COMMON += $(R)pico/cd/pico_arm.s
+SRCS_COMMON += $(R)pico/cd/mcd_arm.s
 endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINES += _ASM_CD_MEMORY_C
@@ -85,10 +92,10 @@ else
 DEFINES += NO_SMS
 endif
 # CD
-SRCS_COMMON += $(R)pico/cd/pico.c $(R)pico/cd/memory.c $(R)pico/cd/sek.c \
-       $(R)pico/cd/LC89510.c $(R)pico/cd/cd_sys.c $(R)pico/cd/cd_file.c \
-       $(R)pico/cd/cue.c $(R)pico/cd/gfx_cd.c $(R)pico/cd/misc.c \
-       $(R)pico/cd/pcm.c $(R)pico/cd/buffering.c
+SRCS_COMMON += $(R)pico/cd/mcd.c $(R)pico/cd/memory.c $(R)pico/cd/sek.c \
+       $(R)pico/cd/cdc.c $(R)pico/cd/cdd.c $(R)pico/cd/cd_image.c \
+       $(R)pico/cd/cue.c $(R)pico/cd/gfx.c $(R)pico/cd/gfx_dma.c \
+       $(R)pico/cd/misc.c $(R)pico/cd/pcm.c
 # 32X
 ifneq "$(no_32x)" "1"
 SRCS_COMMON += $(R)pico/32x/32x.c $(R)pico/32x/memory.c $(R)pico/32x/draw.c \
@@ -157,15 +164,8 @@ SRCS_COMMON += $(R)cpu/sh2/mame/sh2dasm.c
 SRCS_COMMON += $(R)platform/libpicofe/linux/host_dasm.c
 LDFLAGS += -lbfd -lopcodes -liberty
 endif
-ifeq "$(drc_debug_interp)" "1"
-DEFINES += DRC_DEBUG_INTERP
-use_sh2mame = 1
-endif
 endif # use_sh2drc
-#
-ifeq "$(use_sh2mame)" "1"
 SRCS_COMMON += $(R)cpu/sh2/mame/sh2pico.c
-endif
 endif # !no_32x
 
 OBJS_COMMON := $(SRCS_COMMON:.c=.o)
@@ -181,9 +181,11 @@ $(FR)cpu/cyclone/Cyclone.h:
        @echo "Cyclone submodule is missing, please run 'git submodule update --init'"
        @false
 
-$(FR)cpu/cyclone/Cyclone.s:
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone_config.h
        @echo building Cyclone...
-       @make -C $(R)cpu/cyclone/ CONFIG_FILE='\"../cyclone_config.h\"'
+       @make -C $(R)cpu/cyclone/ CONFIG_FILE=../cyclone_config.h
+
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h
 
 $(FR)cpu/musashi/m68kops.c:
        @make -C $(R)cpu/musashi