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 /keyboard/ergodox_ez/Makefile | |
parent | 4122ad3f7b0e0dc1083a54b51430c8d7207d74ef (diff) | |
parent | 69f05e1afd2e046938209e00db62d18efead4932 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboard/ergodox_ez/Makefile')
-rw-r--r-- | keyboard/ergodox_ez/Makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile index 5dfcca2c80..3a07ec254f 100644 --- a/keyboard/ergodox_ez/Makefile +++ b/keyboard/ergodox_ez/Makefile @@ -101,6 +101,22 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: ht # MIDI_ENABLE = yes # MIDI controls # UNICODE_ENABLE = yes # Unicode +# If you want to have your own config_user.h, you can just put it in +# your keymap directory. Anything you set there will take precedence +# over the global config.h. +ifneq ("$(wildcard keymaps/$(KEYMAP)/config_user.h)","") +CONFIG_USER_H = keymaps/$(KEYMAP)/config_user.h +endif + +ifdef KEYMAP + +ifeq ("$(wildcard keymaps/$(KEYMAP).c)","") +ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","") + include keymaps/$(KEYMAP)/makefile.mk +endif +endif +endif + # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax |