Browse Source

mbed build workaround for #212

tags/v2.9
tmk 6 years ago
parent
commit
449b31c18b
3 changed files with 8 additions and 16 deletions
  1. 2
    5
      converter/ps2_usb/Makefile.mbed
  2. 2
    5
      keyboard/infinity/Makefile
  3. 4
    6
      keyboard/mbed_onekey/Makefile

+ 2
- 5
converter/ps2_usb/Makefile.mbed View File

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

+ 2
- 5
keyboard/infinity/Makefile View File

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

+ 4
- 6
keyboard/mbed_onekey/Makefile View File

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

Loading…
Cancel
Save