diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 17:42:30 +0100 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 17:42:30 +0100 |
| commit | 547da78335298df6666200c6063ac6f1aba312fd (patch) | |
| tree | 47df0252ee24b1ecc27b9dd0458c51f20bf088c3 /keyboard/gh60 | |
| parent | a766918d5c48204375f4c207b30bbbf1389df14f (diff) | |
| parent | fa33719adab1393753312d298b8c365e04e844b9 (diff) | |
| download | qmk_firmware-547da78335298df6666200c6063ac6f1aba312fd.tar.gz qmk_firmware-547da78335298df6666200c6063ac6f1aba312fd.tar.xz | |
merging tmk
Diffstat (limited to 'keyboard/gh60')
| -rw-r--r-- | keyboard/gh60/Makefile | 10 | ||||
| -rw-r--r-- | keyboard/gh60/Makefile.pjrc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index b48ee3fde..6b0f1a0e8 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 = ../../tmk_core # 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 diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index 9655ff65a..11bd3b784 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = gh60_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . @@ -97,11 +97,11 @@ NKRO_ENABLE = yes # USB Nkey Rollover(+500) # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk plain: OPT_DEFS += -DKEYMAP_PLAIN plain: all |