updates midi functionality (#331)

[qmk_firmware.git] / quantum / quantum.mk

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index de93af7e8cbe0af3863052bca27f34cb064bf939..e7ccfd659825beb24d0242f7ec8a8299270c366b 100644 (file)
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -1,7 +1,8 @@
 QUANTUM_DIR = quantum
 
 # # project specific files
-SRC += $(QUANTUM_DIR)/keymap_common.c \
+SRC += $(QUANTUM_DIR)/quantum.c \
+       $(QUANTUM_DIR)/keymap_common.c \
        $(QUANTUM_DIR)/led.c
 
 # ifdef KEYMAP_FILE
@@ -23,19 +24,21 @@ ifndef CUSTOM_MATRIX
        SRC += $(QUANTUM_DIR)/matrix.c
 endif
 
-ifdef MIDI_ENABLE
-       SRC += $(QUANTUM_DIR)/keymap_midi.c
-endif
+#ifeq ($(strip $(MIDI_ENABLE)), yes)
+#      SRC += $(QUANTUM_DIR)/keymap_midi.c
+#endif
 
-ifdef AUDIO_ENABLE
-       SRC += $(QUANTUM_DIR)/audio.c
+ifeq ($(strip $(AUDIO_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/audio/audio.c
+    SRC += $(QUANTUM_DIR)/audio/voices.c
+    SRC += $(QUANTUM_DIR)/audio/luts.c
 endif
 
-ifdef UNICODE_ENABLE
+ifeq ($(strip $(UNICODE_ENABLE)), yes)
        SRC += $(QUANTUM_DIR)/keymap_unicode.c
 endif
 
-ifdef RGBLIGHT_ENABLE
+ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
        SRC += $(QUANTUM_DIR)/light_ws2812.c
        SRC += $(QUANTUM_DIR)/rgblight.c
        OPT_DEFS += -DRGBLIGHT_ENABLE
@@ -46,6 +49,8 @@ endif
 
 # Search Path
 VPATH += $(TOP_DIR)/$(QUANTUM_DIR)
+VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/keymap_extras
+VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/audio
 
 include $(TMK_DIR)/protocol/lufa.mk