diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2018-01-13 20:38:25 -0800 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-01-13 23:38:25 -0500 |
| commit | 5836d1a06a7265781fa37acf13e3ba9df7224247 (patch) | |
| tree | fe4161c2cb1dc28b5eab39c5d97caedc92b7efc8 /common_features.mk | |
| parent | fd359e23e8b46826f480d1bcf21261c3f777e2f4 (diff) | |
| download | qmk_firmware-5836d1a06a7265781fa37acf13e3ba9df7224247.tar.gz qmk_firmware-5836d1a06a7265781fa37acf13e3ba9df7224247.zip | |
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.mk | 6 |
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) | |||
| 34 | OPT_DEFS += -DAUDIO_ENABLE | 34 | OPT_DEFS += -DAUDIO_ENABLE |
| 35 | MUSIC_ENABLE := 1 | 35 | MUSIC_ENABLE := 1 |
| 36 | SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c | 36 | SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c |
| 37 | SRC += $(QUANTUM_DIR)/audio/audio.c | 37 | ifeq ($(PLATFORM),AVR) |
| 38 | SRC += $(QUANTUM_DIR)/audio/audio.c | ||
| 39 | else | ||
| 40 | SRC += $(QUANTUM_DIR)/audio/audio_arm.c | ||
| 41 | endif | ||
| 38 | SRC += $(QUANTUM_DIR)/audio/voices.c | 42 | SRC += $(QUANTUM_DIR)/audio/voices.c |
| 39 | SRC += $(QUANTUM_DIR)/audio/luts.c | 43 | SRC += $(QUANTUM_DIR)/audio/luts.c |
| 40 | endif | 44 | endif |