summaryrefslogtreecommitdiff
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-04-13 14:07:48 -0400
committerGitHub <noreply@github.com>2017-04-13 14:07:48 -0400
commit41a46c7c8e4aa2470c245cbe09deb57c0720698e (patch)
tree8b07323439fc477f47833d7ee7564e26b323a3eb /build_keyboard.mk
parentd3301c0f8b0005738ab9aa2030d83739ffb5c4b6 (diff)
parentd68294615f9c67764c06a7524fb59c22c024a106 (diff)
downloadqmk_firmware-41a46c7c8e4aa2470c245cbe09deb57c0720698e.tar.gz
qmk_firmware-41a46c7c8e4aa2470c245cbe09deb57c0720698e.zip
Merge pull request #1224 from fredizzimo/fix_warnings
Fix all warnings and turn on warnings as errors
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