summaryrefslogtreecommitdiff
path: root/protocol/lufa.mk
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-02-11 22:56:30 +0900
committertmk <nobody@nowhere>2013-02-11 22:56:30 +0900
commite9e4c0edc52dbf4afe11251b8b50df130ef57423 (patch)
tree748d6dda8848e5049610b9154d65acf01b6181d2 /protocol/lufa.mk
parentb60f9c6ac6fa9f63cba7ffb6872095a8f0788e42 (diff)
Add support for LUFA-120730
Diffstat (limited to 'protocol/lufa.mk')
-rw-r--r--protocol/lufa.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index bf6fc97b8e..443b85344b 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,10 +1,16 @@
LUFA_DIR = protocol/lufa
# Path to the LUFA library
-LUFA_PATH = protocol/lufa/LUFA-120219
-
-# Create the LUFA source path variables by including the LUFA root makefile
-include $(TOP_DIR)/$(LUFA_PATH)/LUFA/makefile
+LUFA_PATH ?= protocol/lufa/LUFA-120730
+
+# Create the LUFA source path variables by including the LUFA makefile
+ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
+ # New build system from 20120730
+ LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
+ include $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk
+else
+ include $(TOP_DIR)/$(LUFA_PATH)/LUFA/makefile
+endif
LUFA_SRC = $(LUFA_DIR)/lufa.c \
$(LUFA_DIR)/descriptor.c \