diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 14:52:18 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 14:52:18 -0400 |
| commit | d311fd8d1a0af3b767d26b520d399bf0db22f058 (patch) | |
| tree | b9de5704143ac205b4e26222f9d7551e9b161924 /keyboard/macway | |
| parent | a766918d5c48204375f4c207b30bbbf1389df14f (diff) | |
| parent | 6f3141965e88c4ee0ebf7c18a243e4c2d9c5021b (diff) | |
Merge pull request #34 from jackhumbert/tmk-master
merging from tmk, new_project script and template
Diffstat (limited to 'keyboard/macway')
| -rw-r--r-- | keyboard/macway/Makefile.lufa | 10 | ||||
| -rw-r--r-- | keyboard/macway/Makefile.pjrc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/keyboard/macway/Makefile.lufa b/keyboard/macway/Makefile.lufa index 359a8c246d..8fff93ada5 100644 --- a/keyboard/macway/Makefile.lufa +++ b/keyboard/macway/Makefile.lufa @@ -42,7 +42,7 @@ TARGET = macway_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . @@ -114,8 +114,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # 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/macway/Makefile.pjrc b/keyboard/macway/Makefile.pjrc index 9e84a34185..6ee25b61af 100644 --- a/keyboard/macway/Makefile.pjrc +++ b/keyboard/macway/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = macway_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . @@ -90,8 +90,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex # 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 |