diff options
| author | tmk <nobody@nowhere> | 2014-06-18 02:22:59 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-07-30 14:07:43 +0900 |
| commit | 80c3ff5fa03429f1e4ea15032f665ceb88c9b8c3 (patch) | |
| tree | 803fe5b419419607146b6ba1db69d24486b1494e | |
| parent | e81c70149ecf73256f8bb7d77cefc07f2b91d2be (diff) | |
| download | qmk_firmware-80c3ff5fa03429f1e4ea15032f665ceb88c9b8c3.tar.gz qmk_firmware-80c3ff5fa03429f1e4ea15032f665ceb88c9b8c3.zip | |
Fix build files for mbed
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | keyboard/mbed_onekey/Makefile | 13 | ||||
| -rw-r--r-- | protocol/mbed/HIDKeyboard.cpp (renamed from keyboard/mbed_onekey/HIDKeyboard.cpp) | 0 | ||||
| -rw-r--r-- | protocol/mbed/HIDKeyboard.h (renamed from keyboard/mbed_onekey/HIDKeyboard.h) | 0 | ||||
| -rw-r--r-- | protocol/mbed/mbed_driver.cpp (renamed from keyboard/mbed_onekey/mbed_driver.cpp) | 0 | ||||
| -rw-r--r-- | protocol/mbed/mbed_driver.h (renamed from keyboard/mbed_onekey/mbed_driver.h) | 0 | ||||
| -rw-r--r-- | tool/mbed/common.mk (renamed from keyboard/mbed_onekey/common.mk) | 0 | ||||
| -rw-r--r-- | tool/mbed/gcc.mk (renamed from keyboard/mbed_onekey/gcc.mk) | 0 | ||||
| -rw-r--r-- | tool/mbed/mbed.mk (renamed from keyboard/mbed_onekey/mbed.mk) | 7 |
9 files changed, 13 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index c25d41d238..b79d72b7c7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ *.map *.sym tags +build/ +*.bak diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile index e686f424e6..d0d1148ce2 100644 --- a/keyboard/mbed_onekey/Makefile +++ b/keyboard/mbed_onekey/Makefile @@ -1,7 +1,4 @@ -# This file was automagically generated by mbed.org. For more information, -# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded - -PROJECT = USBKeyboard_HelloWorld +PROJECT = mbed_onekey TMK_DIR = ../.. MBED_DIR = ./mbed-sdk @@ -14,8 +11,6 @@ vpath %.cpp .:$(MBED_DIR):$(TMK_DIR) OBJDIR = ./build OBJECTS = \ - $(OBJDIR)/./HIDKeyboard.o \ - $(OBJDIR)/./mbed_driver.o \ $(OBJDIR)/./main.o CONFIG_H = config.h @@ -33,6 +28,6 @@ LIBRARIES = MOUSEKEY_ENABLE = yes -include mbed.mk -include common.mk -include gcc.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/mbed_onekey/HIDKeyboard.cpp b/protocol/mbed/HIDKeyboard.cpp index f40c2d2f2a..f40c2d2f2a 100644 --- a/keyboard/mbed_onekey/HIDKeyboard.cpp +++ b/protocol/mbed/HIDKeyboard.cpp diff --git a/keyboard/mbed_onekey/HIDKeyboard.h b/protocol/mbed/HIDKeyboard.h index 4ebe610a63..4ebe610a63 100644 --- a/keyboard/mbed_onekey/HIDKeyboard.h +++ b/protocol/mbed/HIDKeyboard.h diff --git a/keyboard/mbed_onekey/mbed_driver.cpp b/protocol/mbed/mbed_driver.cpp index 333f8e3782..333f8e3782 100644 --- a/keyboard/mbed_onekey/mbed_driver.cpp +++ b/protocol/mbed/mbed_driver.cpp diff --git a/keyboard/mbed_onekey/mbed_driver.h b/protocol/mbed/mbed_driver.h index dd1153b43a..dd1153b43a 100644 --- a/keyboard/mbed_onekey/mbed_driver.h +++ b/protocol/mbed/mbed_driver.h diff --git a/keyboard/mbed_onekey/common.mk b/tool/mbed/common.mk index 1bd7d6edbe..1bd7d6edbe 100644 --- a/keyboard/mbed_onekey/common.mk +++ b/tool/mbed/common.mk diff --git a/keyboard/mbed_onekey/gcc.mk b/tool/mbed/gcc.mk index 0fc41fe275..0fc41fe275 100644 --- a/keyboard/mbed_onekey/gcc.mk +++ b/tool/mbed/gcc.mk diff --git a/keyboard/mbed_onekey/mbed.mk b/tool/mbed/mbed.mk index 962a05e6e5..0f12ee2af3 100644 --- a/keyboard/mbed_onekey/mbed.mk +++ b/tool/mbed/mbed.mk @@ -89,4 +89,11 @@ INCLUDE_PATHS += \ -I$(MBED_DIR)/libraries/USBDevice/USBMSD \ -I$(MBED_DIR)/libraries/USBDevice/USBMIDI +OBJECTS += \ + $(OBJDIR)/protocol/mbed/mbed_driver.o \ + $(OBJDIR)/protocol/mbed/HIDKeyboard.o \ + +INCLUDE_PATHS += \ + -I$(TMK_DIR)/protocol/mbed + LINKER_SCRIPT = $(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/TARGET_LPC11U35_401/LPC11U35.ld |