diff options
author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-29 15:03:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-29 15:03:52 +0200 |
commit | 584b804ee33d53102fef3b8cdd045bca4c47bf26 (patch) | |
tree | cccdc512fed02293ffd0bfb962ec14d8a8664e7f /build_keyboard.mk | |
parent | 215dd126d08b29939c53bf0eaa006ce6ecdedb83 (diff) | |
parent | 26bbfd78125224abdbd2e4ccf3aa3df1b5fc4968 (diff) |
Merge pull request #21 from qmk/master
Merge from QMK
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 |