diff options
author | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-16 15:19:20 -0700 |
---|---|---|
committer | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-16 15:19:20 -0700 |
commit | 857600aa4b3a6e46afe17b689ab7cedf7dd4688e (patch) | |
tree | 079ebd7369a2034c16178deadeda26ffa04e717b /build_keyboard.mk | |
parent | 22afddb8e8b92873b0adcb0feb09061077e7b709 (diff) | |
parent | b5e8327755100252060afbd54e16322522b4f1e9 (diff) |
Merge branch 'master' into dev
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 10 |
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 |