Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828'

[max/tmk_keyboard.git] / converter / ps2_usb / Makefile.mbed

diff --git a/converter/ps2_usb/Makefile.mbed b/converter/ps2_usb/Makefile.mbed
index eeb5ad9d5e5f8fe4e8ce328be95aed72915da7bd..bbd9bd45b56d3163120bc6f520fef32bd5b9a2c9 100644 (file)
--- a/converter/ps2_usb/Makefile.mbed
+++ b/converter/ps2_usb/Makefile.mbed
@@ -1,12 +1,9 @@
 PROJECT = ps2_usb
 
 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
 
@@ -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