diff options
| author | Xyverz <xyverz@gmail.com> | 2016-08-17 23:53:56 -0700 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2016-08-17 23:53:56 -0700 |
| commit | 385b827c858d492e8ebafd85bac32ab738292d41 (patch) | |
| tree | 169024032cff358909387b08ad31fed4ceee8617 /Makefile | |
| parent | 5c5c3e626b7f2e4a5835988c069c7154f347c4ca (diff) | |
| parent | 8144ce8852f690d5772d80ed2b96ae4af201e266 (diff) | |
| download | qmk_firmware-385b827c858d492e8ebafd85bac32ab738292d41.tar.gz qmk_firmware-385b827c858d492e8ebafd85bac32ab738292d41.zip | |
Merge remote-tracking branch 'upstream/master'
this merge is necessary,
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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) |