summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorErez Zukerman <ezuk@madmimi.com>2016-05-05 22:19:59 -0400
committerErez Zukerman <ezuk@madmimi.com>2016-05-05 22:21:39 -0400
commit8ffc73fcbdddf4ba11aa18658d9aaf7bdd9145c5 (patch)
tree81411f5085d6fad783648b6c7cd1e2c8814913cc /tmk_core
parentf293bf23404ea380e779a791e8c6a78d0a2fc45e (diff)
downloadqmk_firmware-8ffc73fcbdddf4ba11aa18658d9aaf7bdd9145c5.tar.gz
qmk_firmware-8ffc73fcbdddf4ba11aa18658d9aaf7bdd9145c5.zip
[Jack & Erez] Adds an option for user-specific config.h files
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/rules.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 860fc1a931..69c7985b48 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -142,6 +142,9 @@ CFLAGS += $(CSTANDARD)
ifdef CONFIG_H
CFLAGS += -include $(CONFIG_H)
endif
+ifdef CONFIG_USER_H
+ CFLAGS += -include $(CONFIG_USER_H)
+endif
#---------------- Compiler Options C++ ----------------
@@ -176,6 +179,9 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
ifdef CONFIG_H
CPPFLAGS += -include $(CONFIG_H)
endif
+ifdef CONFIG_USER_H
+ CPPFLAGS += -include $(CONFIG_USER_H)
+endif
#---------------- Assembler Options ----------------
@@ -192,6 +198,9 @@ ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
ifdef CONFIG_H
ASFLAGS += -include $(CONFIG_H)
endif
+ifdef CONFIG_USER_H
+ ASFLAGS += -include $(CONFIG_USER_H)
+endif
#---------------- Library Options ----------------