Add build options of ps2_mouse

[tmk_firmware.git] / protocol / lufa.mk

diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index bf6fc97b8e87a3e7ade6f48280e178a8906f6d04..3489f19c2c9f7e80816b06afa7d0f6264699d30c 100644 (file)
--- 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
+LUFA_PATH ?= protocol/lufa/LUFA-120730
 
-# Create the LUFA source path variables by including the LUFA root makefile
-include $(TOP_DIR)/$(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 \
@@ -25,12 +31,12 @@ VPATH += $(TOP_DIR)/$(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