diff options
| author | Callum Oakley <callum@pusher.com> | 2017-08-19 10:34:45 +0100 |
|---|---|---|
| committer | Callum Oakley <callum@pusher.com> | 2017-08-19 10:34:45 +0100 |
| commit | a6845036e25c4f4d936dcd12cd0ddedd2894b30e (patch) | |
| tree | b23b4e8d9d757aa3c0d42be561572533ae0d126c /tmk_core/protocol/lufa.mk | |
| parent | 84a8aabe5bf8807595f98de44d18f6a31b892edf (diff) | |
| parent | 7277f09bbadcce120f819132dec8ff7172caacc4 (diff) | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'tmk_core/protocol/lufa.mk')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 7ce727dab0..4d005debcd 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -1,16 +1,17 @@ LUFA_DIR = protocol/lufa # Path to the LUFA library -LUFA_PATH ?= $(LUFA_DIR)/LUFA-git +LUFA_PATH = $(LIB_PATH)/lufa # Create the LUFA source path variables by including the LUFA makefile -ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) +ifneq (, $(wildcard $(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) # New build system from 20120730 LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA - include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk + DMBS_LUFA_PATH = $(LUFA_PATH)/LUFA/Build/LUFA + include $(LUFA_PATH)/LUFA/Build/lufa_sources.mk else - include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile + include $(LUFA_PATH)/LUFA/makefile endif LUFA_SRC = lufa.c \ @@ -49,7 +50,7 @@ SRC += $(LUFA_SRC) # Search Path VPATH += $(TMK_PATH)/$(LUFA_DIR) -VPATH += $(TMK_PATH)/$(LUFA_PATH) +VPATH += $(LUFA_PATH) # Option modules #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) |