summaryrefslogtreecommitdiffstats
path: root/common_features.mk
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2018-01-14 05:38:25 +0100
committerJack Humbert <jack.humb@gmail.com>2018-01-14 05:38:25 +0100
commit5836d1a06a7265781fa37acf13e3ba9df7224247 (patch)
treefe4161c2cb1dc28b5eab39c5d97caedc92b7efc8 /common_features.mk
parentfd359e23e8b46826f480d1bcf21261c3f777e2f4 (diff)
downloadqmk_firmware-5836d1a06a7265781fa37acf13e3ba9df7224247.tar.gz
qmk_firmware-5836d1a06a7265781fa37acf13e3ba9df7224247.tar.xz
Fix up the ARM audio support (#2136)
* Get audio working on clueboard/60 * add keys for music mode * Change doubles to floats * add keys for all the songs * revert to the default startup sound * Remove music mode until we can figure out why it crashes
Diffstat (limited to 'common_features.mk')
-rw-r--r--common_features.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/common_features.mk b/common_features.mk
index 319834b5e..a67cf230f 100644
--- 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