summaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa.mk
diff options
context:
space:
mode:
authorPriyadi Iman Nurcahyo2017-02-09 01:01:24 +0700
committerPriyadi Iman Nurcahyo2017-02-09 01:01:24 +0700
commit3f2c0bfa86150c9fc91d8f467ed3728beecbb480 (patch)
treed262d74a36b2be52199f976121365c83e536d4fa /tmk_core/protocol/lufa.mk
parent3835b4bfcc0ef296a94c9fe78f27d5cada1ab73b (diff)
parent0a9fda968da521e373564895d6ea6774cd1480d9 (diff)
Merge branch 'master' into promethium
Diffstat (limited to 'tmk_core/protocol/lufa.mk')
-rw-r--r--tmk_core/protocol/lufa.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 151d26cbc..de0cc795f 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)