Skip to content

Commit

Permalink
mbed build workaround for #212
Browse files Browse the repository at this point in the history
  • Loading branch information
@tmk
tmk committed Feb 19, 2016
1 parent 1d9c939 commit 449b31c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
7 changes: 2 additions & 5 deletions converter/ps2_usb/Makefile.mbed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
7 changes: 2 additions & 5 deletions keyboard/infinity/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions keyboard/mbed_onekey/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

0 comments on commit 449b31c

Please sign in to comment.