diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-07 13:12:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 13:12:29 -0500 |
| commit | 0c2b6951a6ad80649798c0eca36a9999ebae0b13 (patch) | |
| tree | fb8c24479e7978848a1c2a7ff39f117cb3383464 /tmk_core/protocol/lufa.mk | |
| parent | de659486f52db6492be6ca03ce5450690f5d891d (diff) | |
| parent | e7c4f621f14b60bde68c01ae076cac49cac9927e (diff) | |
| download | firmware-0c2b6951a6ad80649798c0eca36a9999ebae0b13.tar.gz firmware-0c2b6951a6ad80649798c0eca36a9999ebae0b13.tar.bz2 firmware-0c2b6951a6ad80649798c0eca36a9999ebae0b13.zip | |
Merge pull request #1057 from priyadi/selectable_output
Implement runtime selectable output (USB or BT)
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 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) |