diff options
| author | cr3473 <joe@createtank.com> | 2015-05-27 08:29:48 -0700 |
|---|---|---|
| committer | cr3473 <joe@createtank.com> | 2015-05-27 08:29:48 -0700 |
| commit | b36d1a87da2395fd5429e2817409c76f065387b5 (patch) | |
| tree | 1e4a76822deaf92db83896548fa3c3003f7640f3 /keyboard/infinity/Makefile | |
| parent | a4cf9ae660b16d1952738139ba8f788368b73eff (diff) | |
| parent | d61d1f5ca3a7dcccc495ac6688e0632c601c0623 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboard/infinity/Makefile')
| -rw-r--r-- | keyboard/infinity/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile index 758296f335..e33c239afb 100644 --- a/keyboard/infinity/Makefile +++ b/keyboard/infinity/Makefile @@ -12,11 +12,16 @@ OBJDIR = ./build OBJECTS = \ $(OBJDIR)/matrix.o \ - $(OBJDIR)/keymap.o \ $(OBJDIR)/keymap_common.o \ $(OBJDIR)/led.o \ $(OBJDIR)/main.o +ifdef KEYMAP + OBJECTS := $(OBJDIR)/keymap_$(KEYMAP).o $(OBJECTS) +else + OBJECTS := $(OBJDIR)/keymap.o $(OBJECTS) +endif + CONFIG_H = config.h INCLUDE_PATHS = -I. |