Fix makefiles -- the auto-addition of -D switches to each LUFA compile time option...

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 71e2da7..fce2e5b 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -111,12 +111,12 @@ LUFA_PATH = ../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USB_DEVICE_ONLY\r
-LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += USE_RAM_DESCRIPTORS\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -181,7 +181,7 @@ BOOT_START = 0x1E000
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 4103014..f3d5cfa 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -111,13 +111,13 @@ LUFA_PATH = ../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USB_DEVICE_ONLY\r
-LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += CONTROL_ONLY_DEVICE\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=32\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += USE_RAM_DESCRIPTORS\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -182,7 +182,7 @@ BOOT_START = 0x1E000
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index f4b8843..ea528fb 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -111,13 +111,13 @@ LUFA_PATH = ../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USB_DEVICE_ONLY\r
-LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += CONTROL_ONLY_DEVICE\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += USE_RAM_DESCRIPTORS\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -182,7 +182,7 @@ BOOT_START = 0xC000
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r

diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index 2e3e72f..c4b0b4b 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/AudioInput/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index 4f76df9..2bdb37a 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/AudioOutput/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 CDEFS += -DAUDIO_OUT_MONO\r
 \r
 \r
 CDEFS += -DAUDIO_OUT_MONO\r
 \r
 \r

diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile
index cb3e0fe..85e51e5 100644 (file)
--- a/Demos/Device/ClassDriver/CDC/makefile
+++ b/Demos/Device/ClassDriver/CDC/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile
index cde2ed4..fcaeab7 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/makefile
+++ b/Demos/Device/ClassDriver/DualCDC/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index d202baf..79416c5 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index 67f4d0b..cc5a070 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index 4bdc241..30add8a 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index 3607f57..aec7852 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index 7221faf..a9e1497 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index e918e0a..962cc00 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index daa1456..271f174 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index ada0a13..b2328b9 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/makefile
+++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -200,8 +200,8 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
-CDEFS += NO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
+CDEFS += -DNO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile
index 7c3aa10..3c20210 100644 (file)
--- a/Demos/Device/ClassDriver/USBtoSerial/makefile
+++ b/Demos/Device/ClassDriver/USBtoSerial/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile
index 5157d4f..7c44d8b 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/makefile
+++ b/Demos/Device/Incomplete/Sideshow/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -195,7 +195,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index 8ebf049..58e953e 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 1401e90..63ad2df 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 CDEFS += -DAUDIO_OUT_STEREO\r
 \r
 \r
 CDEFS += -DAUDIO_OUT_STEREO\r
 \r
 \r

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index ea13597..886a66f 100644 (file)
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile
index 3191b60..b31a8da 100644 (file)
--- a/Demos/Device/LowLevel/DualCDC/makefile
+++ b/Demos/Device/LowLevel/DualCDC/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index e53346b..3d7cf94 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index a9a51d1..ac6a31f 100644 (file)
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index a339911..a73167a 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index 7282d9f..acb2438 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index f9ff1ed..cd5795b 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index e230146..062007f 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_DEVICE_ONLY \r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += INTERRUPT_CONTROL_ENDPOINT\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY \r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\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

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index 4912680..fc7d438 100644 (file)
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index e17c734..423aaab 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -201,8 +201,8 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
-CDEFS += NO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
+CDEFS += -DNO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index ff46809..00e4c55 100644 (file)
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_DEVICE_ONLY\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/CDCHost/makefile b/Demos/Host/ClassDriver/CDCHost/makefile
index 59e7953..2d18a17 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/makefile
+++ b/Demos/Host/ClassDriver/CDCHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/GenericHIDHost/makefile b/Demos/Host/ClassDriver/GenericHIDHost/makefile
index fa99305..e213815 100644 (file)
--- a/Demos/Host/ClassDriver/GenericHIDHost/makefile
+++ b/Demos/Host/ClassDriver/GenericHIDHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/KeyboardHost/makefile b/Demos/Host/ClassDriver/KeyboardHost/makefile
index be9a8ca..3487359 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHost/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
index 4b9aa45..fb71c57 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile
index f9234f4..be32c62 100644 (file)
--- a/Demos/Host/ClassDriver/MassStorageHost/makefile
+++ b/Demos/Host/ClassDriver/MassStorageHost/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/MouseHost/makefile b/Demos/Host/ClassDriver/MouseHost/makefile
index be9e9d7..d835f27 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHost/makefile
+++ b/Demos/Host/ClassDriver/MouseHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/makefile b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
index c5f81e2..4c05b9f 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/ClassDriver/StillImageHost/makefile b/Demos/Host/ClassDriver/StillImageHost/makefile
index c1cedd8..9ae6a02 100644 (file)
--- a/Demos/Host/ClassDriver/StillImageHost/makefile
+++ b/Demos/Host/ClassDriver/StillImageHost/makefile
@@ -122,10 +122,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile
index 86bdd04..2bbcc3b 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/makefile
+++ b/Demos/Host/Incomplete/BluetoothHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -193,7 +193,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile
index de217df..ac15810 100644 (file)
--- a/Demos/Host/LowLevel/CDCHost/makefile
+++ b/Demos/Host/LowLevel/CDCHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile
index a117578..e75ef14 100644 (file)
--- a/Demos/Host/LowLevel/GenericHIDHost/makefile
+++ b/Demos/Host/LowLevel/GenericHIDHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile
index ef77810..b86760a 100644 (file)
--- a/Demos/Host/LowLevel/KeyboardHost/makefile
+++ b/Demos/Host/LowLevel/KeyboardHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
index faf8910..2514488 100644 (file)
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile
index f236eed..96d1b9f 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/makefile
+++ b/Demos/Host/LowLevel/MassStorageHost/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile
index f62697d..e6eafda 100644 (file)
--- a/Demos/Host/LowLevel/MouseHost/makefile
+++ b/Demos/Host/LowLevel/MouseHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile
index caf20df..de17efc 100644 (file)
--- a/Demos/Host/LowLevel/MouseHostWithParser/makefile
+++ b/Demos/Host/LowLevel/MouseHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile
index 96eca42..258ea81 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/makefile
+++ b/Demos/Host/LowLevel/StillImageHost/makefile
@@ -122,10 +122,10 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Demos/Host/makefile b/Demos/Host/makefile
index 937c8fa..2531413 100644 (file)
--- a/Demos/Host/makefile
+++ b/Demos/Host/makefile
@@ -14,5 +14,5 @@
 # code.
 
 %:
 # code.
 
 %:

-       make -C ClassDriver/ $@
+#      make -C ClassDriver/ $@        <TODO: Re-enable after Host class drivers complete>

        make -C LowLevel/ $@
        make -C LowLevel/ $@

diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile
index b5c50bb..b0021af 100644 (file)
--- a/Demos/OTG/TestApp/makefile
+++ b/Demos/OTG/TestApp/makefile
@@ -123,7 +123,7 @@ LUFA_PATH = ../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 421719b..1932b64 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -302,7 +302,7 @@ uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber)
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r

-uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* DeviceDescriptorPtr)\r
+uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr)\r

 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h
index 2a40a1d..26e2d76 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.h
+++ b/LUFA/Drivers/USB/LowLevel/Host.h
@@ -199,7 +199,7 @@
                         *\r
                         *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.\r
                         */\r
                         *\r
                         *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.\r
                         */\r

-                       uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* DeviceDescriptorPtr);\r
+                       uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr);\r

                        \r
                        /** Clears a stall condition on the given pipe, via a ClearFeature request to the attached device.\r
                         *\r
                        \r
                        /** Clears a stall condition on the given pipe, via a ClearFeature request to the attached device.\r
                         *\r

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 53f9b3a..8231ca9 100644 (file)
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -14,6 +14,7 @@
   *  - Make new host class drivers\r
   *  - Document new host class drivers\r
   *  - Convert Host mode demos to class drivers\r
   *  - Make new host class drivers\r
   *  - Document new host class drivers\r
   *  - Convert Host mode demos to class drivers\r

+  *  - Re-enable Host mode Class driver builds after completion\r

   *  - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES\r
   *  - Add multiple-report HID demo to the library\r
   *  - Add dual role Mouse Host/Keyboard Device demo to the library\r
   *  - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES\r
   *  - Add multiple-report HID demo to the library\r
   *  - Add dual role Mouse Host/Keyboard Device demo to the library\r

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index edea3ce..e9cea8d 100644 (file)
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../..
 
 
 # LUFA library compile-time options
 
 
 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES
-LUFA_OPTS += USB_DEVICE_ONLY
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += -D USB_DEVICE_ONLY
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 
 
 # List C source files here. (C dependencies are automatically generated.)
 
 
 # List C source files here. (C dependencies are automatically generated.)


@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 
 
 # Place -D or -U options here for C sources
 
 
 # Place -D or -U options here for C sources

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)

 CDEFS += -DMAG_T1_CLOCK="(1 << 0)"
 CDEFS += -DMAG_T1_DATA="(1 << 1)"
 CDEFS += -DMAG_T2_CLOCK="(1 << 2)"
 CDEFS += -DMAG_T1_CLOCK="(1 << 0)"
 CDEFS += -DMAG_T1_DATA="(1 << 1)"
 CDEFS += -DMAG_T2_CLOCK="(1 << 2)"

diff --git a/Projects/MissileLauncher/makefile b/Projects/MissileLauncher/makefile
index 91482c6..e7ec35a 100644 (file)
--- a/Projects/MissileLauncher/makefile
+++ b/Projects/MissileLauncher/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += NO_STREAM_CALLBACKS\r
-LUFA_OPTS += USB_HOST_ONLY\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS += -D USB_HOST_ONLY\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r