beeps update

[qmk_firmware.git] / protocol / lufa.mk

diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 8ea071afbe64fc5ad9ebe6465021533e776aaef9..5dbb74ffc2cdd11d1a3e0cb6505364ae5725f67e 100644 (file)
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,7 +1,12 @@
 LUFA_DIR = protocol/lufa
 
 # Path to the LUFA library
-LUFA_PATH ?= protocol/lufa/LUFA-120730
+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
+
 
 # Create the LUFA source path variables by including the LUFA makefile
 ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
@@ -16,6 +21,14 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
           $(LUFA_DIR)/descriptor.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_USBCLASS)
+endif
+
 SRC += $(LUFA_SRC)
 
 # Search Path
@@ -30,11 +43,12 @@ VPATH += $(TOP_DIR)/$(LUFA_PATH)
 #endif
 
 # LUFA library compile-time options and predefined tokens
-LUFA_OPTS  = -D USB_DEVICE_ONLY
-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS  = -DUSB_DEVICE_ONLY
+LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
+LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+#LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
+LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 
+LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
 
 OPT_DEFS += -DF_USB=$(F_USB)UL
 OPT_DEFS += -DARCH=ARCH_$(ARCH)