Add support for Infinity 60% 1.1a

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

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index e97f759dfa235fcaa424bbf87cad98eca6cdbcfc..052134c3ceafb5dd1baa53e99c9979f7202af9d3 100644 (file)
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -1,18 +1,24 @@
 PROJECT = infinity
 
-TMK_DIR = ../..
-MBED_DIR = $(TMK_DIR)/mbed-sdk
+TMK_DIR = ../../tmk_core
+MBED_DIR = $(TMK_DIR)/tool/mbed/mbed-sdk
 
-#VPATH += $(MBED_DIR):$(TMK_DIR)
-vpath %.s .:$(MBED_DIR):$(TMK_DIR)
-vpath %.c .:$(MBED_DIR):$(TMK_DIR)
-vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
+VPATH += $(TMK_DIR):$(MBED_DIR)
 
 OBJDIR = ./build
 
 OBJECTS = \
+       $(OBJDIR)/matrix.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.
@@ -24,10 +30,10 @@ INCLUDE_PATHS = -I.
 #MOUSEKEY_ENABLE = yes
 
 
+include $(TMK_DIR)/tool/mbed/common.mk
 include mbed-infinity.mk
 include $(TMK_DIR)/tool/mbed/mbed.mk
-include $(TMK_DIR)/tool/mbed/common.mk
 include $(TMK_DIR)/tool/mbed/gcc.mk
 
-program:
+program: $(OBJDIR)/$(PROJECT).bin
        dfu-util -D $(OBJDIR)/$(PROJECT).bin