diff options
| author |  Tobias Matt <t.matt81+github@gmail.com> | 2016-05-13 10:08:29 +0200 |
|---|---|---|
| committer | Tobias Matt <t.matt81+github@gmail.com> | 2016-05-13 10:08:29 +0200 |
| commit | 65645fb8cad05307b9faf9a897eefd5ae8c46dad (patch) | |
| tree | c522c0cd320c4930b7532d892c0831b148c98e93 /tmk_core/rules.mk | |
| parent | 4122ad3f7b0e0dc1083a54b51430c8d7207d74ef (diff) | |
| parent | 69f05e1afd2e046938209e00db62d18efead4932 (diff) | |
| download | qmk_firmware-65645fb8cad05307b9faf9a897eefd5ae8c46dad.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/rules.mk')
| -rw-r--r-- | tmk_core/rules.mk | 9 |
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) 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 ---------------- |