Move LUFA compile time options to a new section in the application makefiles for...

[pub/USBasp.git] / Demos / Host / ClassDriver / MassStorageHost / makefile

diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile
index 5adf3ca..f9234f4 100644 (file)
--- a/Demos/Host/ClassDriver/MassStorageHost/makefile
+++ b/Demos/Host/ClassDriver/MassStorageHost/makefile
@@ -122,6 +122,14 @@ OBJDIR = .
 LUFA_PATH = ../../../..\r
 \r
 \r
 LUFA_PATH = ../../../..\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
+\r
+\r

 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Lib/MassStoreCommands.c                                     \\r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Lib/MassStoreCommands.c                                     \\r


@@ -184,10 +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)\r
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY\r
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-CDEFS += -DUSB_STREAM_TIMEOUT_MS=2000\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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