Fix up the ARM audio support (#2136)

[qmk_firmware.git] / common_features.mk

diff --git a/common_features.mk b/common_features.mk
index 3c77f588edecdc816dfe275d94f64e3ac9ae1456..a67cf230f39a8f2fb7ede1b67d8fbc1ef7f035c0 100644 (file)
--- a/common_features.mk
+++ b/common_features.mk
@@ -34,7 +34,11 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
     OPT_DEFS += -DAUDIO_ENABLE
     MUSIC_ENABLE := 1
     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
-    SRC += $(QUANTUM_DIR)/audio/audio.c
+    ifeq ($(PLATFORM),AVR)
+        SRC += $(QUANTUM_DIR)/audio/audio.c
+    else
+        SRC += $(QUANTUM_DIR)/audio/audio_arm.c
+    endif
     SRC += $(QUANTUM_DIR)/audio/voices.c
     SRC += $(QUANTUM_DIR)/audio/luts.c
 endif
@@ -70,8 +74,9 @@ ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
-    OPT_DEFS += -DPOINTING_DEVICE_ENABLE
-    SRC += $(QUANTUM_DIR)/pointing_device.c
+       OPT_DEFS += -DPOINTING_DEVICE_ENABLE
+       OPT_DEFS += -DMOUSE_ENABLE
+       SRC += $(QUANTUM_DIR)/pointing_device.c
 endif
 
 ifeq ($(strip $(UCIS_ENABLE)), yes)