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

diff --git a/platform/common/common.mak b/platform/common/common.mak
index 8d6b792..32b7a64 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -1,3 +1,17 @@
+ifdef drc_debug
+use_fame = 1
+use_cz80 = 1
+use_cyclone = 0
+use_drz80 = 0
+
+asm_memory = 0
+asm_render = 0
+asm_ym2612 = 0
+asm_misc = 0
+asm_cdmemory = 0
+asm_mix = 0
+endif
+
 ifeq "$(profile)" "1"
 CFLAGS += -fprofile-generate
 endif
@@ -15,6 +29,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
@@ -39,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/pico_arm.s
-endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINES += _ASM_CD_MEMORY_C
 SRCS_COMMON += $(R)pico/cd/memory_arm.s
@@ -52,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
 
@@ -70,14 +87,14 @@ 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 \
-	$(R)pico/32x/pwm.c
+	$(R)pico/32x/sh2soc.c $(R)pico/32x/pwm.c
 else
 DEFINES += NO_32X
 endif
@@ -85,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
@@ -142,15 +160,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)
@@ -166,9 +177,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