diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-04-13 15:58:58 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2017-04-13 16:03:01 +0300 |
| commit | d8e2ff2964480182f0e3513785e310b4ee96c4ee (patch) | |
| tree | c084ab6edef6501a88d6d8576b1dcb665d655d54 /build_keyboard.mk | |
| parent | 07fc34e962a54f87802f11e9e30ed5891325f07e (diff) | |
| download | qmk_firmware-d8e2ff2964480182f0e3513785e310b4ee96c4ee.tar.gz qmk_firmware-d8e2ff2964480182f0e3513785e310b4ee96c4ee.zip | |
Fix process_unicode_common.c being included twice
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 9da8277db..9fa8c3126 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
| @@ -176,22 +176,26 @@ endif | |||
| 176 | 176 | ||
| 177 | ifeq ($(strip $(UCIS_ENABLE)), yes) | 177 | ifeq ($(strip $(UCIS_ENABLE)), yes) |
| 178 | OPT_DEFS += -DUCIS_ENABLE | 178 | OPT_DEFS += -DUCIS_ENABLE |
| 179 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c | 179 | UNICODE_COMMON = yes |
| 180 | SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c | 180 | SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c |
| 181 | endif | 181 | endif |
| 182 | 182 | ||
| 183 | ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) | 183 | ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) |
| 184 | OPT_DEFS += -DUNICODEMAP_ENABLE | 184 | OPT_DEFS += -DUNICODEMAP_ENABLE |
| 185 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c | 185 | UNICODE_COMMON = yes |
| 186 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c | 186 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c |
| 187 | endif | 187 | endif |
| 188 | 188 | ||
| 189 | ifeq ($(strip $(UNICODE_ENABLE)), yes) | 189 | ifeq ($(strip $(UNICODE_ENABLE)), yes) |
| 190 | OPT_DEFS += -DUNICODE_ENABLE | 190 | OPT_DEFS += -DUNICODE_ENABLE |
| 191 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c | 191 | UNICODE_COMMON = yes |
| 192 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c | 192 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c |
| 193 | endif | 193 | endif |
| 194 | 194 | ||
| 195 | ifeq ($(strip $(UNICODE_COMMON)), yes) | ||
| 196 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c | ||
| 197 | endif | ||
| 198 | |||
| 195 | ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) | 199 | ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) |
| 196 | OPT_DEFS += -DRGBLIGHT_ENABLE | 200 | OPT_DEFS += -DRGBLIGHT_ENABLE |
| 197 | SRC += $(QUANTUM_DIR)/light_ws2812.c | 201 | SRC += $(QUANTUM_DIR)/light_ws2812.c |