diff options
| author |  Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-20 08:22:44 +0200 |
|---|---|---|
| committer | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-20 08:22:44 +0200 |
| commit | ee43856ff7ba37ea89d1a8a4700efba4e4f69571 (patch) | |
| tree | b0ed5b538396b0b2b027e69ad8ceac443c067c79 /tmk_core/protocol/lufa.mk | |
| parent | 99b6e918eab31d4f53cabc04a995da945335ac7f (diff) | |
| parent | 14c5160b1a94d5dc416002791b3c207ba0dca789 (diff) | |
| download | qmk_firmware-ee43856ff7ba37ea89d1a8a4700efba4e4f69571.tar.gz | |
Merge 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 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) |