diff options
| author | dbroqua <dbroqua@mousur.org> | 2017-04-02 23:27:57 +0200 |
|---|---|---|
| committer | dbroqua <dbroqua@mousur.org> | 2017-04-02 23:27:57 +0200 |
| commit | e7347ff0de93ff823462b3ff2b4136b44dc576c0 (patch) | |
| tree | 286e2a78fee74eb370641a981d2c81c8e02942b4 /tmk_core/protocol/lufa.mk | |
| parent | 9e72b7e7e97f9ae92c7eb1de66aa03cad047baf6 (diff) | |
| parent | 24ec8f509703cbaf9de7b41d251dbb7fcd339559 (diff) | |
Merge remote-tracking branch 'origin/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) |