Pārlūkot izejas kodu

Fix build files for mbed

tmk 11 gadi atpakaļ
vecāks
revīzija
80c3ff5fa0

+ 2 - 0
.gitignore

@@ -8,3 +8,5 @@
 *.map
 *.sym
 tags
+build/
+*.bak

+ 4 - 9
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

+ 0 - 0
keyboard/mbed_onekey/HIDKeyboard.cpp → protocol/mbed/HIDKeyboard.cpp


+ 0 - 0
keyboard/mbed_onekey/HIDKeyboard.h → protocol/mbed/HIDKeyboard.h


+ 0 - 0
keyboard/mbed_onekey/mbed_driver.cpp → protocol/mbed/mbed_driver.cpp


+ 0 - 0
keyboard/mbed_onekey/mbed_driver.h → protocol/mbed/mbed_driver.h


+ 0 - 0
keyboard/mbed_onekey/common.mk → tool/mbed/common.mk


+ 0 - 0
keyboard/mbed_onekey/gcc.mk → tool/mbed/gcc.mk


+ 7 - 0
keyboard/mbed_onekey/mbed.mk → 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