diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-27 19:12:07 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-27 19:12:07 +0000 |
| commit | 2ff1370221d3650a6bc0523c93c2f0d37508f408 (patch) | |
| tree | b1d7f7a2a7dbebaf76e43e0f977d227d0cabf95a /Projects/USBtoSerial/makefile | |
| parent | b017b41e91f7eb7bb83d1466b45c24e01ac2e309 (diff) | |
| parent | 1e42f7bd46fbef1e67f50741e4fe1a5ea3a70869 (diff) | |
| download | lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.gz lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.bz2 lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.zip | |
Merge in AppConfigHeaders branch to trunk, altering all projects and demos to use configuration headers for application and LUFA compile time settings, rather than defines in the project makefiles.
Diffstat (limited to 'Projects/USBtoSerial/makefile')
| -rw-r--r-- | Projects/USBtoSerial/makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Projects/USBtoSerial/makefile b/Projects/USBtoSerial/makefile index 93cb3d13f..e4073c1c3 100644 --- a/Projects/USBtoSerial/makefile +++ b/Projects/USBtoSerial/makefile @@ -120,14 +120,7 @@ LUFA_PATH = ../.. # LUFA library compile-time options and predefined tokens -LUFA_OPTS = -D USB_DEVICE_ONLY -LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 -LUFA_OPTS += -D ORDERED_EP_CONFIG -LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 -LUFA_OPTS += -D USE_FLASH_DESCRIPTORS -LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT +LUFA_OPTS = -D USE_LUFA_CONFIG_HEADER # Create the LUFA source path variables by including the LUFA root makefile @@ -172,7 +165,7 @@ DEBUG = dwarf-2 # Each directory must be seperated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. -EXTRAINCDIRS = $(LUFA_PATH)/ +EXTRAINCDIRS = $(LUFA_PATH)/ Config/ # Compiler flag to set the C Standard level. |