X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=protocol%2Flufa.mk;h=3489f19c2c9f7e80816b06afa7d0f6264699d30c;hb=221af6bffbb8c5af57ae64068d34e5ea165b3a82;hp=ad6cab6d3bd85fa2455406e921c2f9e470c7e67a;hpb=fca518f90dfc7f72132ff7950b000cfbd5709807;p=tmk_firmware.git

diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index ad6cab6..3489f19 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,18 +1,26 @@
 LUFA_DIR = protocol/lufa
 
 # Path to the LUFA library
-LUFA_PATH = $(TOP_DIR)/protocol/lufa/LUFA-120219
+LUFA_PATH ?= protocol/lufa/LUFA-120730
 
-# Create the LUFA source path variables by including the LUFA root makefile
-include $(LUFA_PATH)/LUFA/makefile
+# 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 \
 	   $(LUFA_SRC_USB)
-SRC += $(subst $(LUFA_PATH)/,,$(LUFA_SRC))
+
+SRC += $(LUFA_SRC)
 
 # Search Path
-VPATH += $(LUFA_PATH)
+VPATH += $(TOP_DIR)/$(LUFA_DIR)
+VPATH += $(TOP_DIR)/$(LUFA_PATH)
 
 # Option modules
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
@@ -23,12 +31,12 @@ VPATH += $(LUFA_PATH)
 
 # 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)"
 
 OPT_DEFS += -DF_USB=$(F_USB)UL
 OPT_DEFS += -DARCH=ARCH_$(ARCH)
 OPT_DEFS += $(LUFA_OPTS)
-OPT_DEFS += -DHOST_LUFA
+
+# This indicates using LUFA stack
+OPT_DEFS += -DPROTOCOL_LUFA