diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-13 16:06:03 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-13 16:06:03 -0400 |
| commit | dc9bf78f2b1d7d894576d87ea9bfc86d7bb3deee (patch) | |
| tree | 44f432118882f9176ef6d901dc3d389d28737254 /tmk_core/protocol/lufa.mk | |
| parent | d649ab34334ff568448c47a04fcf40f1aa960135 (diff) | |
| parent | 25d4772754186b8ab6ef86c28049da67a460f123 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/protocol/lufa.mk')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 9ac6298f11..b0f8919007 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -5,23 +5,23 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git # Create the LUFA source path variables by including the LUFA makefile -ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) +ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) # New build system from 20120730 LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA - include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk else - include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile endif -LUFA_SRC = $(LUFA_DIR)/lufa.c \ - $(LUFA_DIR)/descriptor.c \ +LUFA_SRC = lufa.c \ + descriptor.c \ $(LUFA_SRC_USB) ifeq ($(strip $(MIDI_ENABLE)), yes) - LUFA_SRC += $(LUFA_DIR)/midi/midi.c \ - $(LUFA_DIR)/midi/midi_device.c \ - $(LUFA_DIR)/midi/bytequeue/bytequeue.c \ - $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \ + LUFA_SRC += midi/midi.c \ + midi/midi_device.c \ + midi/bytequeue/bytequeue.c \ + midi/bytequeue/interrupt_setting.c \ $(LUFA_SRC_USBCLASS) endif @@ -33,8 +33,8 @@ endif SRC += $(LUFA_SRC) # Search Path -VPATH += $(TMK_DIR)/$(LUFA_DIR) -VPATH += $(TMK_DIR)/$(LUFA_PATH) +VPATH += $(TMK_PATH)/$(LUFA_DIR) +VPATH += $(TMK_PATH)/$(LUFA_PATH) # Option modules #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) |