From f15b2691c92e1d9b3c0e59363c803ec540303f37 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 15 Jun 2014 13:56:17 +0900
Subject: Add keyboard/mbed_onekey

---
 keyboard/mbed_onekey/Makefile | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 keyboard/mbed_onekey/Makefile

(limited to 'keyboard/mbed_onekey/Makefile')

diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
new file mode 100644
index 0000000000..e194052c10
--- /dev/null
+++ b/keyboard/mbed_onekey/Makefile
@@ -0,0 +1,29 @@
+# This file was automagically generated by mbed.org. For more information, 
+# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded
+
+PROJECT = USBKeyboard_HelloWorld
+
+TMK_DIR = ../..
+MBED_DIR = ./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)
+
+OBJDIR = ./build
+
+OBJECTS = \
+	$(OBJDIR)/./HIDKeyboard.o \
+	$(OBJDIR)/./main.o
+
+SYS_OBJECTS = 
+
+INCLUDE_PATHS = -I.
+
+LIBRARY_PATHS = 
+LIBRARIES = 
+
+include mbed.mk
+include common.mk
+include gcc.mk
-- 
cgit v1.2.3


From c67ae2a6b546c822759352586c14cd9dccbbe0ff Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 17 Jun 2014 00:57:59 +0900
Subject: Port action_* to mbed

---
 keyboard/mbed_onekey/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'keyboard/mbed_onekey/Makefile')

diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index e194052c10..1bc91bc7e7 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -15,6 +15,7 @@ OBJDIR = ./build
 
 OBJECTS = \
 	$(OBJDIR)/./HIDKeyboard.o \
+	$(OBJDIR)/./mbed_driver.o \
 	$(OBJDIR)/./main.o
 
 SYS_OBJECTS = 
-- 
cgit v1.2.3


From e81c70149ecf73256f8bb7d77cefc07f2b91d2be Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 17 Jun 2014 22:41:14 +0900
Subject: Fix common files for mbed

---
 keyboard/mbed_onekey/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'keyboard/mbed_onekey/Makefile')

diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index 1bc91bc7e7..e686f424e6 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -18,6 +18,8 @@ OBJECTS = \
 	$(OBJDIR)/./mbed_driver.o \
 	$(OBJDIR)/./main.o
 
+CONFIG_H = config.h
+
 SYS_OBJECTS = 
 
 INCLUDE_PATHS = -I.
@@ -25,6 +27,12 @@ INCLUDE_PATHS = -I.
 LIBRARY_PATHS = 
 LIBRARIES = 
 
+# Build Options
+#   Comment out to disable
+#BOOTMAGIC_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+
+
 include mbed.mk
 include common.mk
 include gcc.mk
-- 
cgit v1.2.3


From 80c3ff5fa03429f1e4ea15032f665ceb88c9b8c3 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 18 Jun 2014 02:22:59 +0900
Subject: Fix build files for mbed

---
 keyboard/mbed_onekey/Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'keyboard/mbed_onekey/Makefile')

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
-- 
cgit v1.2.3


From 4c8e0fd0bd1712421f957ec5e0ca16fc6bbb3856 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 19 Jun 2014 16:13:35 +0900
Subject: Port ps2_usb to mbed

---
 keyboard/mbed_onekey/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboard/mbed_onekey/Makefile')

diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index d0d1148ce2..2f7399ba02 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -1,7 +1,7 @@
 PROJECT = mbed_onekey
 
 TMK_DIR = ../..
-MBED_DIR = ./mbed-sdk
+MBED_DIR = $(TMK_DIR)/mbed-sdk
 
 #VPATH += $(MBED_DIR):$(TMK_DIR)
 vpath %.s .:$(MBED_DIR):$(TMK_DIR)
-- 
cgit v1.2.3