summaryrefslogtreecommitdiff
path: root/users/jonavin/rules.mk
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-30 18:54:36 +0000
committerQMK Bot <hello@qmk.fm>2021-10-30 18:54:36 +0000
commit9e4dd8bfcba41ccac0d28ee8ea218142e7aba674 (patch)
treec9fe4c255d0665067e330918e313f66978749e20 /users/jonavin/rules.mk
parentfb739a67c92483f6c072886b9ffbb90e55b6582d (diff)
parent5334e087ef848d54266537ecdc0b87cac976517e (diff)
downloadqmk_firmware-9e4dd8bfcba41ccac0d28ee8ea218142e7aba674.tar.gz
qmk_firmware-9e4dd8bfcba41ccac0d28ee8ea218142e7aba674.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/jonavin/rules.mk')
-rw-r--r--users/jonavin/rules.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/users/jonavin/rules.mk b/users/jonavin/rules.mk
index 6460021247..4f65db27b9 100644
--- a/users/jonavin/rules.mk
+++ b/users/jonavin/rules.mk
@@ -1,6 +1,13 @@
SRC += jonavin.c
-ifeq ($(strip $(ENCODER_DEFAULTACTIONS_ENABLE)), yes)
- OPT_DEFS += -DENCODER_DEFAULTACTIONS_ENABLE
+ifdef ENCODER_ENABLE
+ # include encoder related code when enabled
+ ifeq ($(strip $(ENCODER_DEFAULTACTIONS_ENABLE)), yes)
+ OPT_DEFS += -DENCODER_DEFAULTACTIONS_ENABLE
+ endif
+ ifeq ($(strip $(ALTTAB_SCROLL_ENABLE)), yes)
+ OPT_DEFS += -DALTTAB_SCROLL_ENABLE
+ endif
+ SRC += jonavin_encoder.c
endif
ifeq ($(strip $(TD_LSFT_CAPSLOCK_ENABLE)), yes)
OPT_DEFS += -DTD_LSFT_CAPSLOCK_ENABLE