From: Erez Zukerman Date: Fri, 6 May 2016 02:19:59 +0000 (-0400) Subject: [Jack & Erez] Adds an option for user-specific config.h files X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8ffc73fcbdddf4ba11aa18658d9aaf7bdd9145c5;p=qmk_firmware.git [Jack & Erez] Adds an option for user-specific config.h files --- 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) 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 ----------------