diff options
author | QMK Bot <hello@qmk.fm> | 2021-12-30 04:18:05 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-12-30 04:18:05 +0000 |
commit | 602b0b14d5d1b67951851c9880dc426411cc65d9 (patch) | |
tree | 7ebaa2f5bb8c1a7ac87f4be84ce88ba73cd3968e /users/drashna/rules.mk | |
parent | dde5cd1c54fc6f93ff439666f5c421a451e4e8dd (diff) | |
parent | c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/drashna/rules.mk')
-rw-r--r-- | users/drashna/rules.mk | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk index 32afae22c9..445d1cf5ac 100644 --- a/users/drashna/rules.mk +++ b/users/drashna/rules.mk @@ -1,5 +1,7 @@ SRC += $(USER_PATH)/drashna.c \ - $(USER_PATH)/keyrecords/process_records.c + $(USER_PATH)/callbacks.c \ + $(USER_PATH)/keyrecords/process_records.c \ + $(USER_PATH)/keyrecords/tapping.c ifneq ($(PLATFORM),CHIBIOS) ifneq ($(strip $(LTO_SUPPORTED)), no) @@ -8,6 +10,7 @@ ifneq ($(PLATFORM),CHIBIOS) endif SPACE_CADET_ENABLE = no GRAVE_ESC_ENABLE = no +# DEBUG_MATRIX_SCAN_RATE_ENABLE = api ifneq ($(strip $(NO_SECRETS)), yes) ifneq ("$(wildcard $(USER_PATH)/keyrecords/secrets.c)","") @@ -18,12 +21,23 @@ ifneq ($(strip $(NO_SECRETS)), yes) endif endif +ifeq ($(strip $(MAKE_BOOTLOADER)), yes) + OPT_DEFS += -DMAKE_BOOTLOADER +endif + +# At least until build.mk or the like drops, this is here to prevent +# VUSB boards from enabling NKRO, as they do not support it. Ideally +# this should be handled per keyboard, but until that happens ... +ifeq ($(strip $(PROTOCOL)), VUSB) + NKRO_ENABLE := no +endif + CUSTOM_UNICODE_ENABLE ?= yes ifeq ($(strip $(CUSTOM_UNICODE_ENABLE)), yes) - UNICODE_ENABLE = no - UNICODEMAP_ENABLE = no - UCIS_ENABLE = no - UNICODE_COMMON = yes + UNICODE_ENABLE := no + UNICODEMAP_ENABLE := no + UCIS_ENABLE := no + UNICODE_COMMON := yes OPT_DEFS += -DCUSTOM_UNICODE_ENABLE SRC += $(USER_PATH)/keyrecords/unicode.c endif @@ -62,17 +76,6 @@ ifdef CONSOLE_ENABLE endif endif -ifeq ($(strip $(MAKE_BOOTLOADER)), yes) - OPT_DEFS += -DMAKE_BOOTLOADER -endif - -# At least until build.mk or the like drops, this is here to prevent -# VUSB boards from enabling NKRO, as they do not support it. Ideally -# this should be handled per keyboard, but until that happens ... -ifeq ($(strip $(PROTOCOL)), VUSB) - NKRO_ENABLE = no -endif - CUSTOM_OLED_DRIVER ?= yes ifeq ($(strip $(OLED_ENABLE)), yes) ifeq ($(strip $(CUSTOM_OLED_DRIVER)), yes) @@ -96,15 +99,13 @@ ifeq ($(strip $(CUSTOM_SPLIT_TRANSPORT_SYNC)), yes) endif endif -# DEBUG_MATRIX_SCAN_RATE_ENABLE = api - -AUTOCORRECTION_ENABLE ?= yes +AUTOCORRECTION_ENABLE ?= no ifeq ($(strip $(AUTOCORRECTION_ENABLE)), yes) SRC += $(USER_PATH)/keyrecords/autocorrection/autocorrection.c OPT_DEFS += -DAUTOCORRECTION_ENABLE endif -CAPS_WORD_ENABLE ?= yes +CAPS_WORD_ENABLE ?= no ifeq ($(strip $(CAPS_WORD_ENABLE)), yes) SRC += $(USER_PATH)/keyrecords/caps_word.c OPT_DEFS += -DCAPS_WORD_ENABLE |