diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-07-07 15:33:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 15:33:29 -0400 |
| commit | 9de443cbf10ac41bc15762c9c83f138f51dd3b9a (patch) | |
| tree | d8ddcb428e0b7d9773a1e52c42b60bdca2658beb /tmk_core/protocol/lufa.mk | |
| parent | 88b3d051b21cb1ddacc6353c5d59b19f03f3a242 (diff) | |
| parent | 1c26468ad5a0701e244c99cbcbc547c93b75d515 (diff) | |
| download | qmk_firmware-9de443cbf10ac41bc15762c9c83f138f51dd3b9a.tar.gz qmk_firmware-9de443cbf10ac41bc15762c9c83f138f51dd3b9a.zip | |
Merge pull request #1471 from qmk/lufa_lib
Update LUFA and move it to /lib/lufa
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) |