diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 12:42:30 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 12:42:30 -0400 |
| commit | 547da78335298df6666200c6063ac6f1aba312fd (patch) | |
| tree | 47df0252ee24b1ecc27b9dd0458c51f20bf088c3 /keyboard/kmac | |
| parent | a766918d5c48204375f4c207b30bbbf1389df14f (diff) | |
| parent | fa33719adab1393753312d298b8c365e04e844b9 (diff) | |
| download | qmk_firmware-547da78335298df6666200c6063ac6f1aba312fd.tar.gz qmk_firmware-547da78335298df6666200c6063ac6f1aba312fd.zip | |
merging tmk
Diffstat (limited to 'keyboard/kmac')
| -rw-r--r-- | keyboard/kmac/Makefile.lufa | 10 | ||||
| -rw-r--r-- | keyboard/kmac/Makefile.pjrc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/keyboard/kmac/Makefile.lufa b/keyboard/kmac/Makefile.lufa index 09343d4bc4..9745f43cd4 100644 --- a/keyboard/kmac/Makefile.lufa +++ b/keyboard/kmac/Makefile.lufa @@ -42,7 +42,7 @@ TARGET = kmac_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . @@ -117,11 +117,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # 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 winkey: OPT_DEFS += -DLAYOUT_WINKEY winkey: all diff --git a/keyboard/kmac/Makefile.pjrc b/keyboard/kmac/Makefile.pjrc index 22ee8de47a..b32d935bdf 100644 --- a/keyboard/kmac/Makefile.pjrc +++ b/keyboard/kmac/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = kmac_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . @@ -88,11 +88,11 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # 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 winkey: OPT_DEFS += -DLAYOUT_WINKEY winkey: all |