aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common.mk
diff options
context:
space:
mode:
authorStephan Bösebeck <[email protected]>2016-04-17 22:17:40 +0200
committerStephan Bösebeck <[email protected]>2016-04-17 22:17:40 +0200
commit7c3345f9b9aeb44306d2fe5b640f3ee95868efeb (patch)
tree874de8f8254513978d2c001b63b6a81c514f7706 /tmk_core/common.mk
parent38a1d830faa138f6a7e094b3eda33dc528112ec7 (diff)
parenta67d425f4d5278595e7ab785a0f246b83fb1a09f (diff)
downloadqmk_firmware-7c3345f9b9aeb44306d2fe5b640f3ee95868efeb.tar.gz
qmk_firmware-7c3345f9b9aeb44306d2fe5b640f3ee95868efeb.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r--tmk_core/common.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index f8006c6708..9cb2eb8ecd 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -21,6 +21,9 @@ ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
SRC += $(COMMON_DIR)/bootmagic.c
SRC += $(COMMON_DIR)/avr/eeconfig.c
OPT_DEFS += -DBOOTMAGIC_ENABLE
+else
+ SRC += $(COMMON_DIR)/magic.c
+ SRC += $(COMMON_DIR)/avr/eeconfig.c
endif
ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)