From: tmk <hasu@tmk-kbd.com>
Date: Fri, 19 Feb 2016 05:40:33 +0000 (+0900)
Subject: mbed build workaround for #212
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=449b31c18baaa4d051612dd5d3e6e379fc736016;p=max%2Ftmk_keyboard.git

mbed build workaround for #212
---

diff --git a/converter/ps2_usb/Makefile.mbed b/converter/ps2_usb/Makefile.mbed
index a7ea5bcf..bbd9bd45 100644
--- a/converter/ps2_usb/Makefile.mbed
+++ b/converter/ps2_usb/Makefile.mbed
@@ -3,10 +3,7 @@ PROJECT = ps2_usb
 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
 
@@ -39,8 +36,8 @@ LIBRARIES =
 MOUSEKEY_ENABLE = yes
 
 
+include $(TMK_DIR)/tool/mbed/common.mk
 #include $(TMK_DIR)/tool/mbed/mk20d50m.mk
 include $(TMK_DIR)/tool/mbed/lpc11u35_501.mk
 include $(TMK_DIR)/tool/mbed/mbed.mk
-include $(TMK_DIR)/tool/mbed/common.mk
 include $(TMK_DIR)/tool/mbed/gcc.mk
diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index e740b6ad..052134c3 100644
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -3,10 +3,7 @@ PROJECT = infinity
 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
 
@@ -33,9 +30,9 @@ 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: $(OBJDIR)/$(PROJECT).bin
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index b9c88fdd..c755806f 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -1,12 +1,9 @@
 PROJECT = mbed_onekey
 
 TMK_DIR = ../../tmk_core
-MBED_DIR = $(TMK_DIR)/mbed-sdk
+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
 
@@ -28,6 +25,7 @@ LIBRARIES =
 #MOUSEKEY_ENABLE = yes
 
 
-include $(TMK_DIR)/tool/mbed/mbed.mk
 include $(TMK_DIR)/tool/mbed/common.mk
+include $(TMK_DIR)/tool/mbed/lpc11u35_501.mk
+include $(TMK_DIR)/tool/mbed/mbed.mk
 include $(TMK_DIR)/tool/mbed/gcc.mk