diff options
| author | Xyverz <xyverz@gmail.com> | 2017-02-10 23:34:27 -0800 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-02-10 23:34:27 -0800 |
| commit | 902d5077cd54f3a964e3276d7858212d975818ec (patch) | |
| tree | cddf5a379614f421908bbe57ae5d396cc1e2ed37 /tmk_core/protocol/lufa.mk | |
| parent | 4d7105c2cf47c7604b54cdf488b4eb9d08c1f1cf (diff) | |
| parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa.mk')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 151d26cbc8..de0cc795f6 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -8,13 +8,14 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git ifneq (, $(wildcard $(TMK_PATH)/$(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 + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk else include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile endif LUFA_SRC = lufa.c \ descriptor.c \ + outputselect.c \ $(LUFA_SRC_USB) ifeq ($(strip $(MIDI_ENABLE)), yes) |