X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fcommon.mak;h=3c0a5127c87ac4374009daa6f0c5f7cd28d22e3e;hb=59da664524da9eeaf8a6b04b2f8710b5b35d9035;hp=a365abc6939f91a47eedaa213ef71d1c708fac43;hpb=12da51c27a8d1c1205d8f0f01bbc4814c46e79ce;p=picodrive.git

diff --git a/platform/common/common.mak b/platform/common/common.mak
index a365abc..3c0a512 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -63,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
@@ -92,23 +92,23 @@ 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/cd_memory.c $(R)pico/cd/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/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 \
+SRCS_COMMON += $(R)pico/32x/32x.c $(R)pico/32x/32x_memory.c $(R)pico/32x/32x_draw.c \
 	$(R)pico/32x/sh2soc.c $(R)pico/32x/pwm.c
 else
 DEFINES += NO_32X
 endif
 # Pico
-SRCS_COMMON += $(R)pico/pico/pico.c $(R)pico/pico/memory.c $(R)pico/pico/xpcm.c
+SRCS_COMMON += $(R)pico/pico/pico_pico.c $(R)pico/pico/pico_memory.c $(R)pico/pico/xpcm.c
 # carthw
 SRCS_COMMON += $(R)pico/carthw/carthw.c
 # SVP
-SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
+SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/svp_memory.c \
 	$(R)pico/carthw/svp/ssp16.c
 ifeq "$(use_svpdrc)" "1"
 DEFINES += _SVP_DRC
@@ -165,10 +165,7 @@ SRCS_COMMON += $(R)platform/libpicofe/linux/host_dasm.c
 LDFLAGS += -lbfd -lopcodes -liberty
 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)
@@ -184,10 +181,12 @@ $(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
 
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h
+
 $(FR)cpu/musashi/m68kops.c:
 	@make -C $(R)cpu/musashi