diff options
| author |  Christopher Browne <cbbrowne@ca.afilias.info> | 2016-05-24 12:34:08 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-05-24 12:34:08 -0400 |
| commit | 48871b9b6b99201abc381ee27cfd94e211ca131a (patch) | |
| tree | ed5fe45f9f38e364b53a1bac35084782ec6aaf2c /quantum/quantum.mk | |
| parent | c2a3df31239249b2fb65e2552376daac0e49ae61 (diff) | |
| parent | 287eb7ad148abc8fe3fb014218d71e205fd9131d (diff) | |
| download | qmk_firmware-48871b9b6b99201abc381ee27cfd94e211ca131a.tar.gz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/quantum.mk')
| -rw-r--r-- | quantum/quantum.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/quantum/quantum.mk b/quantum/quantum.mk index 83c4f1d1d..c099d6793 100644 --- 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,16 +24,14 @@ ifndef CUSTOM_MATRIX SRC += $(QUANTUM_DIR)/matrix.c endif -ifeq ($(strip $(MIDI_ENABLE)), yes) - SRC += $(QUANTUM_DIR)/keymap_midi.c -endif +#ifeq ($(strip $(MIDI_ENABLE)), yes) +# SRC += $(QUANTUM_DIR)/keymap_midi.c +#endif ifeq ($(strip $(AUDIO_ENABLE)), yes) - SRC += $(QUANTUM_DIR)/audio/audio.c $(QUANTUM_DIR)/audio/voices.c -endif - -ifeq ($(strip $(UNICODE_ENABLE)), yes) - SRC += $(QUANTUM_DIR)/keymap_unicode.c + SRC += $(QUANTUM_DIR)/audio/audio.c + SRC += $(QUANTUM_DIR)/audio/voices.c + SRC += $(QUANTUM_DIR)/audio/luts.c endif ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) |