Merge in latest trunk.

[pub/USBasp.git] / Projects / SerialToLCD / makefile

diff --git a/Projects/SerialToLCD/makefile b/Projects/SerialToLCD/makefile
index 337f249..ba7b5aa 100644 (file)
--- a/Projects/SerialToLCD/makefile
+++ b/Projects/SerialToLCD/makefile
@@ -120,14 +120,7 @@ LUFA_PATH = ../..
 \r
 \r
 # LUFA library compile-time options and predefined tokens\r
 \r
 \r
 # LUFA library compile-time options and predefined tokens\r

-LUFA_OPTS  = -D USB_DEVICE_ONLY\r
-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r
-LUFA_OPTS += -D ORDERED_EP_CONFIG\r
-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT\r
+LUFA_OPTS  = -D USE_LUFA_CONFIG_HEADER\r

 \r
 \r
 # Create the LUFA source path variables by including the LUFA root makefile\r
 \r
 \r
 # Create the LUFA source path variables by including the LUFA root makefile\r


@@ -173,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r

-EXTRAINCDIRS = $(LUFA_PATH)/\r
+EXTRAINCDIRS = $(LUFA_PATH)/ Config/\r

 \r
 \r
 # Compiler flag to set the C Standard level.\r
 \r
 \r
 # Compiler flag to set the C Standard level.\r