diff options
| author | Roman Zolotarev <hi@romanzolotarev.com> | 2016-04-26 16:23:10 +0800 |
|---|---|---|
| committer | Roman Zolotarev <hi@romanzolotarev.com> | 2016-04-26 16:23:10 +0800 |
| commit | 28f0b64e31b8c30a842dfd356421356cf0513177 (patch) | |
| tree | e5a76f4a2fb747c3599de1e297f46e4dc6fd4f0e /quantum/quantum.mk | |
| parent | fa2eedb7bd906634b8c500ba0d91638e63eaafed (diff) | |
| parent | bf56838fe99aafd37559d560e47b707a83c87588 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/quantum.mk')
| -rw-r--r-- | quantum/quantum.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/quantum/quantum.mk b/quantum/quantum.mk index de93af7e8c..83c4f1d1db 100644 --- a/quantum/quantum.mk +++ b/quantum/quantum.mk @@ -23,19 +23,19 @@ ifndef CUSTOM_MATRIX SRC += $(QUANTUM_DIR)/matrix.c endif -ifdef MIDI_ENABLE +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 $(QUANTUM_DIR)/audio/voices.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 +46,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 |