From cda23c754e4d16438e2b42d86b4ce9a1eadc03d7 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 24 Aug 2015 19:31:12 -0400 Subject: midi working --- protocol/lufa.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'protocol/lufa.mk') diff --git a/protocol/lufa.mk b/protocol/lufa.mk index 561c505c2..088fd377e 100644 --- a/protocol/lufa.mk +++ b/protocol/lufa.mk @@ -1,11 +1,11 @@ LUFA_DIR = protocol/lufa # Path to the LUFA library -ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h)) - LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730 -else +#ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h)) +# LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730 +#else LUFA_PATH ?= $(LUFA_DIR)/LUFA-git -endif +#endif # Create the LUFA source path variables by including the LUFA makefile @@ -19,14 +19,15 @@ endif LUFA_SRC = $(LUFA_DIR)/lufa.c \ $(LUFA_DIR)/descriptor.c \ - $(LUFA_SRC_USB) \ - $(LUFA_DIR)/midi/midi.c \ + $(LUFA_SRC_USB) + +ifdef MIDI_ENABLE + LUFA_SRC += $(LUFA_DIR)/midi/midi.c \ $(LUFA_DIR)/midi/midi_device.c \ $(LUFA_DIR)/midi/bytequeue/bytequeue.c \ $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \ - $(LUFA_SRC_USB) \ $(LUFA_SRC_USBCLASS) - +endif SRC += $(LUFA_SRC) -- cgit v1.2.3