From b4e2d325f355a4d083106476393775e75e11f284 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 9 Apr 2015 16:20:42 +0900 Subject: Change TOP_DIR to TMK_DIR in makefiles --- keyboard/gh60/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboard/gh60/Makefile') diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index fd202c1792..347847f778 100644 --- a/keyboard/gh60/Makefile +++ b/keyboard/gh60/Makefile @@ -42,7 +42,7 @@ TARGET = gh60_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . @@ -128,8 +128,8 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk -- cgit v1.2.3 From 7860d09914dba5e7d2d6c1c25b62b49d1bbd2591 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 10 Apr 2015 01:53:24 +0900 Subject: Change TMK_DIR setting --- keyboard/gh60/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboard/gh60/Makefile') diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index 347847f778..083b87c30a 100644 --- a/keyboard/gh60/Makefile +++ b/keyboard/gh60/Makefile @@ -42,7 +42,7 @@ TARGET = gh60_lufa # Directory common source filess exist -TMK_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . -- cgit v1.2.3 From 0e93ee235f9a7595bfe6d947fff60a4f94f168ac Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 27 Oct 2015 12:47:12 -0400 Subject: reverting gh60 --- keyboard/gh60/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboard/gh60/Makefile') diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index 6b0f1a0e8d..daba0f6449 100644 --- a/keyboard/gh60/Makefile +++ b/keyboard/gh60/Makefile @@ -55,7 +55,7 @@ SRC = keymap_common.c \ ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) else - SRC := keymap_planck.c $(SRC) + SRC := keymap_poker.c $(SRC) endif CONFIG_H = config.h @@ -132,4 +132,4 @@ VPATH += $(TMK_DIR) include $(TMK_DIR)/protocol/lufa.mk include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk +include $(TMK_DIR)/rules.mk \ No newline at end of file -- cgit v1.2.3