diff options
Diffstat (limited to 'protocol/lufa.mk')
| -rw-r--r-- | protocol/lufa.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocol/lufa.mk b/protocol/lufa.mk index ac70ac039..2575e89df 100644 --- a/protocol/lufa.mk +++ b/protocol/lufa.mk | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | LUFA_DIR = protocol/lufa | 1 | LUFA_DIR = protocol/lufa |
| 2 | 2 | ||
| 3 | # Path to the LUFA library | 3 | # Path to the LUFA library |
| 4 | ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h)) | 4 | ifeq (, $(wildcard $(TMK_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h)) |
| 5 | LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730 | 5 | LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730 |
| 6 | else | 6 | else |
| 7 | LUFA_PATH ?= $(LUFA_DIR)/LUFA-git | 7 | LUFA_PATH ?= $(LUFA_DIR)/LUFA-git |
| @@ -9,12 +9,12 @@ endif | |||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | # Create the LUFA source path variables by including the LUFA makefile | 11 | # Create the LUFA source path variables by including the LUFA makefile |
| 12 | ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) | 12 | ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) |
| 13 | # New build system from 20120730 | 13 | # New build system from 20120730 |
| 14 | LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA | 14 | LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA |
| 15 | include $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk | 15 | include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk |
| 16 | else | 16 | else |
| 17 | include $(TOP_DIR)/$(LUFA_PATH)/LUFA/makefile | 17 | include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile |
| 18 | endif | 18 | endif |
| 19 | 19 | ||
| 20 | LUFA_SRC = $(LUFA_DIR)/lufa.c \ | 20 | LUFA_SRC = $(LUFA_DIR)/lufa.c \ |
| @@ -24,8 +24,8 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \ | |||
| 24 | SRC += $(LUFA_SRC) | 24 | SRC += $(LUFA_SRC) |
| 25 | 25 | ||
| 26 | # Search Path | 26 | # Search Path |
| 27 | VPATH += $(TOP_DIR)/$(LUFA_DIR) | 27 | VPATH += $(TMK_DIR)/$(LUFA_DIR) |
| 28 | VPATH += $(TOP_DIR)/$(LUFA_PATH) | 28 | VPATH += $(TMK_DIR)/$(LUFA_PATH) |
| 29 | 29 | ||
| 30 | # Option modules | 30 | # Option modules |
| 31 | #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) | 31 | #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) |
