diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-03-16 12:01:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-03-16 12:01:35 -0400 |
| commit | 9307a0a3e415d33d0858283f67fcba4c59a042ff (patch) | |
| tree | 45252e53439dde1122945646f4fa340cf0a8923e /keyboard/infinity/Makefile | |
| parent | be86aefdbda560d6810f9594169fee4385c1422d (diff) | |
| parent | c35c4283b9c2c65d62fe8dc5e4b7ca49a8f5af33 (diff) | |
Merge pull request #6 from tmk/master
pulling from tmk
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. |