summaryrefslogtreecommitdiffstats
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorAdam Lee <adam@bigtuna.io>2017-05-07 14:36:10 -0700
committerAdam Lee <adam@bigtuna.io>2017-05-07 14:36:10 -0700
commitf2fcab96a8dd8cc70d6785da76621c48df1af94c (patch)
tree9be0967ab0d3795e6d20299988c84280f3ad98f6 /build_keyboard.mk
parentf90321bdcbcbd196ee642cdd8cc31aa0f6ac121e (diff)
parent2704c163da590d3020f6d87717c400611de81110 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r--build_keyboard.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 9da8277db9..9fa8c31263 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -176,22 +176,26 @@ endif
ifeq ($(strip $(UCIS_ENABLE)), yes)
OPT_DEFS += -DUCIS_ENABLE
- SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
+ UNICODE_COMMON = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c
endif
ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
OPT_DEFS += -DUNICODEMAP_ENABLE
- SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
+ UNICODE_COMMON = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c
endif
ifeq ($(strip $(UNICODE_ENABLE)), yes)
OPT_DEFS += -DUNICODE_ENABLE
- SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
+ UNICODE_COMMON = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c
endif
+ifeq ($(strip $(UNICODE_COMMON)), yes)
+ SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
+endif
+
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
OPT_DEFS += -DRGBLIGHT_ENABLE
SRC += $(QUANTUM_DIR)/light_ws2812.c