aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-01-16 00:06:51 -0500
committerJack Humbert <jack.humb@gmail.com>2016-01-16 00:06:51 -0500
commit4faddd3449ca553e0d8b02ba91f9a34b534eebe7 (patch)
tree891a24f08764e9c121ebf33004288ce0882de7a6
parent9487e92a6e35383dddc47794462cd37ff77c4256 (diff)
downloadqmk_firmware-4faddd3449ca553e0d8b02ba91f9a34b534eebe7.tar.gz
qmk_firmware-4faddd3449ca553e0d8b02ba91f9a34b534eebe7.zip
working
-rw-r--r--keyboard/planck/keymaps/keymap_lock.c2
-rw-r--r--quantum/quantum.mk15
2 files changed, 17 insertions, 0 deletions
diff --git a/keyboard/planck/keymaps/keymap_lock.c b/keyboard/planck/keymaps/keymap_lock.c
index cc9be55f6..bc81adcf9 100644
--- a/keyboard/planck/keymaps/keymap_lock.c
+++ b/keyboard/planck/keymaps/keymap_lock.c
@@ -1,3 +1,5 @@
1// USING_MIDI
2// USING_BACKLIGHT
1#include "keymap_common.h" 3#include "keymap_common.h"
2#include "backlight.h" 4#include "backlight.h"
3#include "action_layer.h" 5#include "action_layer.h"
diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index c82e47872..62d67be9f 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -4,6 +4,21 @@ QUANTUM_DIR = quantum
4SRC += $(QUANTUM_DIR)/keymap_common.c \ 4SRC += $(QUANTUM_DIR)/keymap_common.c \
5 $(QUANTUM_DIR)/led.c 5 $(QUANTUM_DIR)/led.c
6 6
7ifdef KEYMAP
8ifneq (,$(shell grep USING_MIDI 'keymaps/keymap_$(KEYMAP).c'))
9MIDI_ENABLE=yes
10$(info * Overriding MIDI_ENABLE setting - keymap_$(KEYMAP).c requires it)
11endif
12ifneq (,$(shell grep USING_UNICODE 'keymaps/keymap_$(KEYMAP).c'))
13UNICODE_ENABLE=yes
14$(info * Overriding UNICODE_ENABLE setting - keymap_$(KEYMAP).c requires it)
15endif
16ifneq (,$(shell grep USING_BACKLIGHT 'keymaps/keymap_$(KEYMAP).c'))
17BACKLIGHT_ENABLE=yes
18$(info * Overriding BACKLIGHT_ENABLE setting - keymap_$(KEYMAP).c requires it)
19endif
20endif
21
7ifndef CUSTOM_MATRIX 22ifndef CUSTOM_MATRIX
8 SRC += $(QUANTUM_DIR)/matrix.c 23 SRC += $(QUANTUM_DIR)/matrix.c
9endif 24endif