Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile

2016-01-23 20:34:05 -05:00
parent 544a49329c c753bfcc14
commit 5143c59bdf
17 changed files with 840 additions and 350 deletions
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -24,8 +24,11 @@ ifndef CUSTOM_MATRIX
 endif

 ifdef MIDI_ENABLE
-	SRC += $(QUANTUM_DIR)/keymap_midi.c \
-		   $(QUANTUM_DIR)/beeps.c
+	SRC += $(QUANTUM_DIR)/keymap_midi.c
+endif
+
+ifdef AUDIO_ENABLE
+	SRC += $(QUANTUM_DIR)/audio.c
 endif

 ifdef UNICODE_ENABLE