From 4b37030ad0ddde12a12b8407d577fa07e0cb18f5 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 7 Jul 2017 12:06:59 -0400 Subject: update lufa implementation --- tmk_core/protocol/lufa.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tmk_core/protocol/lufa.mk') diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 7ce727dab..4d005debc 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) -- cgit v1.2.3