diff options
| author | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
|---|---|---|
| committer | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
| commit | 25a7c941746d077d246468bec6bebdb01e478090 (patch) | |
| tree | 906b491bb1465be287ec4dc02e9857437f7582a6 /tmk_core/protocol/lufa.mk | |
| parent | d1fb51976aeef8eeea5975c5bf75b6b1aa649826 (diff) | |
| parent | f5c8c5d4c854c5ae4dc586066c9b03557786c4c2 (diff) | |
| download | qmk_firmware-25a7c941746d077d246468bec6bebdb01e478090.tar.gz qmk_firmware-25a7c941746d077d246468bec6bebdb01e478090.zip | |
Merge remote-tracking branch 'refs/remotes/qmk/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) |