Minor correction to MagStripe demo to fix build problems.

[pub/USBasp.git] / Demos / Device / LowLevel / MassStorage / makefile

diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index 93f8957..062007f 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -119,7 +119,16 @@ OBJDIR = .
 \r
 \r
 # Path to the LUFA library\r
 \r
 \r
 # Path to the LUFA library\r

-LUFA_PATH = ../../..\r
+LUFA_PATH = ../../../..\r
+\r
+\r
+# LUFA library compile-time options\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USB_DEVICE_ONLY \r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT\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


@@ -127,7 +136,6 @@ SRC = $(TARGET).c                                                 \
          Descriptors.c                                               \\r
          Lib/SCSI.c                                                  \\r
          Lib/DataflashManager.c                                      \\r
          Descriptors.c                                               \\r
          Lib/SCSI.c                                                  \\r
          Lib/DataflashManager.c                                      \\r

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

          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r


@@ -138,7 +146,6 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.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/ConfigDescriptor.c  \\r

-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.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


@@ -184,11 +191,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 -DUSB_DEVICE_ONLY\r
-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION\r
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-CDEFS += -DINTERRUPT_CONTROL_ENDPOINT\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(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