makefile stuff

diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 74a8bef3c6b639cef2c721a71cb28aadbcf727c4..561c505c22ab30f3ac02b1900976f5ea68e19543 100644 (file)
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -24,7 +24,9 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
           $(LUFA_DIR)/midi/midi_device.c \
           $(LUFA_DIR)/midi/bytequeue/bytequeue.c \
           $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \
-          $(LUFA_DIR)/LUFA-git/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
+          $(LUFA_SRC_USB) \
+          $(LUFA_SRC_USBCLASS)
+
 
 SRC += $(LUFA_SRC)
 

diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index 03b13f4047d29678e31f122946e0389a6ad4e7f1..78ed6cfe20a3096d28952f314483c3dd209fa040 100644 (file)
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -52,6 +52,8 @@
 #include "descriptor.h"
 #include "lufa.h"
 
+// #include <LUFA/Version.h>
+// #include <LUFA/Drivers/USB/USB.h>
 
 uint8_t keyboard_idle = 0;
 uint8_t keyboard_protocol = 1;

diff --git a/protocol/lufa/lufa.h b/protocol/lufa/lufa.h
index 505cb3279edcdaeb6e70e84cefff7839731d3bf9..554d82ae5f354c909bffb4ed91dc9655c16ffcd6 100644 (file)
--- a/protocol/lufa/lufa.h
+++ b/protocol/lufa/lufa.h
@@ -48,8 +48,9 @@
 #include <LUFA/Version.h>
 #include <LUFA/Drivers/USB/USB.h>
 #include "host.h"
+#ifdef MIDI_ENABLE
 #include "midi/midi.h"
-
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -66,7 +67,9 @@ typedef struct {
     uint16_t usage;
 } __attribute__ ((packed)) report_extra_t;
 
+#ifdef MIDI_ENABLE
 MidiDevice midi_device;
+#endif
 
 #if LUFA_VERSION_INTEGER < 0x120730
     /* old API 120219 */