X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common_features.mk;h=f44dfc47de1f918ebd74caaeeef808e96717b4f5;hb=34112dac36482edbd5331eac3dfe436752ff7653;hp=65ff6b5b38440fb66d76a54d984dc5b4d6a74f1a;hpb=e4eeb1eb230a4d92f1c88197b71a07b342966e73;p=qmk_firmware.git

diff --git a/common_features.mk b/common_features.mk
index 65ff6b5b3..f44dfc47d 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -219,6 +219,11 @@ ifeq ($(strip $(USB_HID_ENABLE)), yes)
     include $(TMK_DIR)/protocol/usb_hid.mk
 endif
 
+ifeq ($(strip $(ENCODER_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/encoder.c
+    OPT_DEFS += -DENCODER_ENABLE
+endif
+
 ifeq ($(strip $(HD44780_ENABLE)), yes)
     SRC += drivers/avr/hd44780.c
     OPT_DEFS += -DHD44780_ENABLE
@@ -239,7 +244,7 @@ QUANTUM_SRC:= \
     $(QUANTUM_DIR)/keymap_common.c \
     $(QUANTUM_DIR)/keycode_config.c
 
-ifndef CUSTOM_MATRIX
+ifneq ($(strip $(CUSTOM_MATRIX)), yes)
     ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
         QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
     else