X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fcommon.mak;h=28d5fa67d151c2cf1c01d29c6cf65e1a45758662;hb=0a91c6e9029e87029b4e7993145f4d05608be34d;hp=40673c6ef6b426ce524482f513755f6569fa6b82;hpb=8c8b72847259871bc50cd796383d9eeb83970bb1;p=picodrive.git

diff --git a/platform/common/common.mak b/platform/common/common.mak
index 40673c6..28d5fa6 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,14 @@ 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"
 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