Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'

[max/tmk_keyboard.git] / keyboard / infinity / Makefile

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index 758296f33504c9d1b08a3059c8031b8bc37270de..aa3e9bff1af61cc3be749ac3424dd361b180c008 100644 (file)
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -1,6 +1,6 @@
 PROJECT = infinity
 
-TMK_DIR = ../..
+TMK_DIR = ../../tmk_core
 MBED_DIR = $(TMK_DIR)/mbed-sdk
 
 #VPATH += $(MBED_DIR):$(TMK_DIR)
@@ -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.