diff options
author | Dean Camera <[email protected]> | 2009-06-19 05:08:04 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-06-19 05:08:04 +0000 |
commit | feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181 (patch) | |
tree | 0ba750826bc90999461f8b5657157742771c6956 /Demos/Device/ClassDriver | |
parent | beb0b2bda0c45e958e88933a055d409e42fa0a0b (diff) | |
download | qmk_firmware-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.tar.gz qmk_firmware-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.zip |
Fix makefiles -- the auto-addition of -D switches to each LUFA compile time option was faulty, due to GNUMake becomming confused by the spaces in the USE_STATIC_OPTIONS lines. Make user add in the switches explicitly instead.
Diffstat (limited to 'Demos/Device/ClassDriver')
-rw-r--r-- | Demos/Device/ClassDriver/AudioInput/makefile | 14 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/makefile | 14 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/CDC/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/DualCDC/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/GenericHID/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/Joystick/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/Keyboard/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/MIDI/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/MassStorage/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/Mouse/makefile | 12 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/RNDISEthernet/makefile | 14 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/USBtoSerial/makefile | 12 |
13 files changed, 81 insertions, 81 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile index 2e3e72f0a4..c4b0b4b1c6 100644 --- a/Demos/Device/ClassDriver/AudioInput/makefile +++ b/Demos/Device/ClassDriver/AudioInput/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options
-LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
-LUFA_OPTS += NO_STREAM_CALLBACKS
-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 NO_STREAM_CALLBACKS
+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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile index 4f76df9b9a..2bdb37a45b 100644 --- a/Demos/Device/ClassDriver/AudioOutput/makefile +++ b/Demos/Device/ClassDriver/AudioOutput/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options
-LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
-LUFA_OPTS += NO_STREAM_CALLBACKS
-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 NO_STREAM_CALLBACKS
+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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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 += -DAUDIO_OUT_MONO
diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile index cb3e0fe0fc..85e51e5ef4 100644 --- a/Demos/Device/ClassDriver/CDC/makefile +++ b/Demos/Device/ClassDriver/CDC/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile index cde2ed46aa..fcaeab77f8 100644 --- a/Demos/Device/ClassDriver/DualCDC/makefile +++ b/Demos/Device/ClassDriver/DualCDC/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile index d202bafdf4..79416c5362 100644 --- a/Demos/Device/ClassDriver/GenericHID/makefile +++ b/Demos/Device/ClassDriver/GenericHID/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile index 67f4d0b473..cc5a070547 100644 --- a/Demos/Device/ClassDriver/Joystick/makefile +++ b/Demos/Device/ClassDriver/Joystick/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile index 4bdc241d30..30add8a9a1 100644 --- a/Demos/Device/ClassDriver/Keyboard/makefile +++ b/Demos/Device/ClassDriver/Keyboard/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile index 3607f579f2..aec7852933 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/makefile +++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile index 7221faf390..a9e1497018 100644 --- a/Demos/Device/ClassDriver/MIDI/makefile +++ b/Demos/Device/ClassDriver/MIDI/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile index e918e0a989..962cc008e5 100644 --- a/Demos/Device/ClassDriver/MassStorage/makefile +++ b/Demos/Device/ClassDriver/MassStorage/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile index daa145615b..271f174c53 100644 --- a/Demos/Device/ClassDriver/Mouse/makefile +++ b/Demos/Device/ClassDriver/Mouse/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile index ada0a13605..b2328b9bd0 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/makefile +++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -200,8 +200,8 @@ CSTANDARD = -std=gnu99 # 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 += NO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
+CDEFS += -DNO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP
# Place -D or -U options here for ASM sources
diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile index 7c3aa10cce..3c202104a9 100644 --- a/Demos/Device/ClassDriver/USBtoSerial/makefile +++ b/Demos/Device/ClassDriver/USBtoSerial/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # 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.)
@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # 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)
# Place -D or -U options here for ASM sources
|