summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorToni <jeder@mail1a.de>2016-08-15 19:48:53 +0200
committerToni <jeder@mail1a.de>2016-08-15 19:48:53 +0200
commit5ecebc3a66946ac7579bcd3afdacdb61387412d1 (patch)
treec1c33b775064ee43a34e81ad859e5111975786e9 /Makefile
parent5705a403205c0c1e7c585e1a2edda21e79134ee6 (diff)
parentcc7acfb416d446a123d10d2c33c3344f1f684f1b (diff)
Merge remote-tracking branch 'origin/master' into iso_split_rshift
no idea what is merged
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 053c8532af..693edc9f06 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,11 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/audio/luts.c
endif
+ifeq ($(strip $(UCIS_ENABLE)), yes)
+ OPT_DEFS += -DUCIS_ENABLE
+ UNICODE_ENABLE = yes
+endif
+
ifeq ($(strip $(UNICODE_ENABLE)), yes)
OPT_DEFS += -DUNICODE_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c
@@ -273,4 +278,4 @@ BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
$(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(QUANTUM_PATH)/version.h)
-$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h) \ No newline at end of file
+$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h)