Skip to content

Commit

Permalink
Fix build files for mbed
Browse files Browse the repository at this point in the history
  • Loading branch information
yashikno committed Jul 30, 2014
1 parent e81c701 commit 80c3ff5
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
*.map
*.sym
tags
build/
*.bak
13 changes: 4 additions & 9 deletions keyboard/mbed_onekey/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions keyboard/mbed_onekey/mbed.mk → tool/mbed/mbed.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 80c3ff5

Please sign in to comment.