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

[pub/USBasp.git] / Demos / OTG / TestApp / makefile

diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile
index 3c34d55..b5c50bb 100644 (file)
--- a/Demos/OTG/TestApp/makefile
+++ b/Demos/OTG/TestApp/makefile
@@ -122,12 +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
+\r
+\r

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

-         $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \\r
-         $(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c                \\r

          $(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \\r
          $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \\r
          $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r


@@ -138,11 +140,9 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r

-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r

-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\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,9 +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)\r
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES\r
-CDEFS += -DNUM_BLOCKS=100 -DBLOCK_SIZE=8 -DNUM_HANDLES=20\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