X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fcommon.mak;h=32b7a6496a469aac3ddd740fd9b8c6e6d951ab93;hb=6a47c2d4fbd413d86c7f6a0cac8e4a4a163f3713;hp=da5a52e42db9dad0e89f04160a622db7feec40aa;hpb=89dbbf2b2fe885c9f443178c1f1350567e92160b;p=picodrive.git

diff --git a/platform/common/common.mak b/platform/common/common.mak
index da5a52e..32b7a64 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -8,7 +8,6 @@ asm_memory = 0
 asm_render = 0
 asm_ym2612 = 0
 asm_misc = 0
-asm_cdpico = 0
 asm_cdmemory = 0
 asm_mix = 0
 endif
@@ -61,10 +60,6 @@ DEFINES += _ASM_MISC_C
 SRCS_COMMON += $(R)pico/misc_arm.s
 SRCS_COMMON += $(R)pico/cd/misc_arm.s
 endif
-ifeq "$(asm_cdpico)" "1"
-DEFINES += _ASM_CD_PICO_C
-SRCS_COMMON += $(R)pico/cd/mcd_arm.s
-endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINES += _ASM_CD_MEMORY_C
 SRCS_COMMON += $(R)pico/cd/memory_arm.s
@@ -74,7 +69,7 @@ DEFINES += _ASM_32X_DRAW
 SRCS_COMMON += $(R)pico/32x/draw_arm.s
 endif
 ifeq "$(asm_mix)" "1"
-SRCS_COMMON += $(R)pico/sound/mix_arm.s
+SRCS_COMMON += $(R)pico/sound/mix_arm.S
 endif
 endif # ARCH=arm
 
@@ -93,9 +88,9 @@ DEFINES += NO_SMS
 endif
 # CD
 SRCS_COMMON += $(R)pico/cd/mcd.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
+	$(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 \
@@ -107,6 +102,7 @@ endif
 SRCS_COMMON += $(R)pico/pico/pico.c $(R)pico/pico/memory.c $(R)pico/pico/xpcm.c
 # carthw
 SRCS_COMMON += $(R)pico/carthw/carthw.c
+SRCS_COMMON += $(R)pico/carthw/eeprom_spi.c
 # SVP
 SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
 	$(R)pico/carthw/svp/ssp16.c
@@ -165,10 +161,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)