X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fcommon%2Fcommon.mak;h=8d6b79291f04dacf9ac71878a6e05d863c13bc6f;hb=009ef50c60a203d779c4cce160cc3e76c3b75a98;hp=40673c6ef6b426ce524482f513755f6569fa6b82;hpb=98dbc3ab3ae9f73ec0232ab0d7090ffd25cdd571;p=picodrive.git

diff --git a/platform/common/common.mak b/platform/common/common.mak
index 40673c6..8d6b792 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -20,7 +20,8 @@ DEFINES += PPROF
 SRCS_COMMON += $(R)platform/linux/pprof.c
 endif
 
-# asm stuff
+# ARM asm stuff
+ifeq "$(ARCH)" "arm"
 ifeq "$(asm_render)" "1"
 DEFINES += _ASM_DRAW_C
 SRCS_COMMON += $(R)pico/draw_arm.S $(R)pico/draw2_arm.S
@@ -50,6 +51,10 @@ ifeq "$(asm_32xdraw)" "1"
 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
+endif
+endif # ARCH=arm
 
 # === Pico core ===
 # Pico
@@ -83,16 +88,15 @@ SRCS_COMMON += $(R)pico/carthw/carthw.c
 # SVP
 SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
 	$(R)pico/carthw/svp/ssp16.c
-ifeq "$(ARCH)" "arm"
+ifeq "$(use_svpdrc)" "1"
+DEFINES += _SVP_DRC
 SRCS_COMMON += $(R)pico/carthw/svp/stub_arm.S
 SRCS_COMMON += $(R)pico/carthw/svp/compiler.c
 endif
 # sound
 SRCS_COMMON += $(R)pico/sound/sound.c
 SRCS_COMMON += $(R)pico/sound/sn76496.c $(R)pico/sound/ym2612.c
-ifeq "$(ARCH)" "arm"
-SRCS_COMMON += $(R)pico/sound/mix_arm.s
-else
+ifneq "$(ARCH)$(asm_mix)" "arm1"
 SRCS_COMMON += $(R)pico/sound/mix.c
 endif
 
@@ -135,7 +139,7 @@ SRCS_COMMON += $(R)cpu/sh2/compiler.c
 ifdef drc_debug
 DEFINES += DRC_DEBUG=$(drc_debug)
 SRCS_COMMON += $(R)cpu/sh2/mame/sh2dasm.c
-SRCS_COMMON += $(R)platform/linux/host_dasm.c
+SRCS_COMMON += $(R)platform/libpicofe/linux/host_dasm.c
 LDFLAGS += -lbfd -lopcodes -liberty
 endif
 ifeq "$(drc_debug_interp)" "1"