X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=keyboard%2Finfinity%2FMakefile;h=052134c3ceafb5dd1baa53e99c9979f7202af9d3;hb=ee2c18f0cd600990566c7b0378aaed4885b22b71;hp=ec9dc00278fd0fb223093945d98d9586820d2fa3;hpb=e259a722e7e8abcb97606b6cfbcce99667a66277;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index ec9dc002..052134c3 100644
--- 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,7 +30,10 @@ INCLUDE_PATHS = -I.
 #MOUSEKEY_ENABLE = yes
 
 
-include $(TMK_DIR)/tool/mbed/mk20d50m.mk
-include $(TMK_DIR)/tool/mbed/mbed.mk
 include $(TMK_DIR)/tool/mbed/common.mk
+include mbed-infinity.mk
+include $(TMK_DIR)/tool/mbed/mbed.mk
 include $(TMK_DIR)/tool/mbed/gcc.mk
+
+program: $(OBJDIR)/$(PROJECT).bin
+	dfu-util -D $(OBJDIR)/$(PROJECT).bin