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.
This commit is contained in:
parent
beb0b2bda0
commit
feabfd12ce
54 changed files with 307 additions and 306 deletions
|
@ -111,13 +111,13 @@ LUFA_PATH = ../..
|
|||
|
||||
|
||||
# LUFA library compile-time options
|
||||
LUFA_OPTS = USB_DEVICE_ONLY
|
||||
LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES
|
||||
LUFA_OPTS += CONTROL_ONLY_DEVICE
|
||||
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 += USE_RAM_DESCRIPTORS
|
||||
LUFA_OPTS = -D USB_DEVICE_ONLY
|
||||
LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES
|
||||
LUFA_OPTS += -D CONTROL_ONLY_DEVICE
|
||||
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)"
|
||||
LUFA_OPTS += -D USE_RAM_DESCRIPTORS
|
||||
|
||||
|
||||
# List C source files here. (C dependencies are automatically generated.)
|
||||
|
@ -182,7 +182,7 @@ BOOT_START = 0xC000
|
|||
|
||||
|
||||
# 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 += -DBOOT_START_ADDR=$(BOOT_START)UL
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue