diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-01-16 06:51:24 +0100 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-01-16 06:52:31 +0100 |
| commit | dfe7004bc545ff7247a0dbef4788b9e1952f9c5d (patch) | |
| tree | 50ce3ca421a1cb0a8864e054ab7d7e00a9171110 /quantum | |
| parent | 4faddd3449ca553e0d8b02ba91f9a34b534eebe7 (diff) | |
| download | qmk_firmware-dfe7004bc545ff7247a0dbef4788b9e1952f9c5d.tar.gz qmk_firmware-dfe7004bc545ff7247a0dbef4788b9e1952f9c5d.tar.xz | |
new keymap folder structure and makefile magic
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/quantum/quantum.mk b/quantum/quantum.mk index 62d67be9f..3a968a145 100644 --- a/quantum/quantum.mk +++ b/quantum/quantum.mk @@ -4,18 +4,18 @@ QUANTUM_DIR = quantum SRC += $(QUANTUM_DIR)/keymap_common.c \ $(QUANTUM_DIR)/led.c -ifdef KEYMAP -ifneq (,$(shell grep USING_MIDI 'keymaps/keymap_$(KEYMAP).c')) +ifdef KEYMAP_FILE +ifneq (,$(shell grep USING_MIDI '$(KEYMAP_FILE)')) MIDI_ENABLE=yes -$(info * Overriding MIDI_ENABLE setting - keymap_$(KEYMAP).c requires it) +$(info * Overriding MIDI_ENABLE setting - $(KEYMAP_FILE) requires it) endif -ifneq (,$(shell grep USING_UNICODE 'keymaps/keymap_$(KEYMAP).c')) +ifneq (,$(shell grep USING_UNICODE '$(KEYMAP_FILE)')) UNICODE_ENABLE=yes -$(info * Overriding UNICODE_ENABLE setting - keymap_$(KEYMAP).c requires it) +$(info * Overriding UNICODE_ENABLE setting - $(KEYMAP_FILE) requires it) endif -ifneq (,$(shell grep USING_BACKLIGHT 'keymaps/keymap_$(KEYMAP).c')) +ifneq (,$(shell grep USING_BACKLIGHT '$(KEYMAP_FILE)')) BACKLIGHT_ENABLE=yes -$(info * Overriding BACKLIGHT_ENABLE setting - keymap_$(KEYMAP).c requires it) +$(info * Overriding BACKLIGHT_ENABLE setting - $(KEYMAP_FILE) requires it) endif endif |