aboutsummaryrefslogtreecommitdiff
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
parentf293bf23404ea380e779a791e8c6a78d0a2fc45e (diff)
downloadqmk_firmware-8ffc73fcbdddf4ba11aa18658d9aaf7bdd9145c5.tar.gz
qmk_firmware-8ffc73fcbdddf4ba11aa18658d9aaf7bdd9145c5.zip
[Jack & Erez] Adds an option for user-specific config.h files
-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 860fc1a93..69c7985b4 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -142,6 +142,9 @@ CFLAGS += $(CSTANDARD)
142ifdef CONFIG_H 142ifdef CONFIG_H
143 CFLAGS += -include $(CONFIG_H) 143 CFLAGS += -include $(CONFIG_H)
144endif 144endif
145ifdef CONFIG_USER_H
146 CFLAGS += -include $(CONFIG_USER_H)
147endif
145 148
146 149
147#---------------- Compiler Options C++ ---------------- 150#---------------- Compiler Options C++ ----------------
@@ -176,6 +179,9 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
176ifdef CONFIG_H 179ifdef CONFIG_H
177 CPPFLAGS += -include $(CONFIG_H) 180 CPPFLAGS += -include $(CONFIG_H)
178endif 181endif
182ifdef CONFIG_USER_H
183 CPPFLAGS += -include $(CONFIG_USER_H)
184endif
179 185
180 186
181#---------------- Assembler Options ---------------- 187#---------------- Assembler Options ----------------
@@ -192,6 +198,9 @@ ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
192ifdef CONFIG_H 198ifdef CONFIG_H
193 ASFLAGS += -include $(CONFIG_H) 199 ASFLAGS += -include $(CONFIG_H)
194endif 200endif
201ifdef CONFIG_USER_H
202 ASFLAGS += -include $(CONFIG_USER_H)
203endif
195 204
196 205
197#---------------- Library Options ---------------- 206#---------------- Library Options ----------------