Added new \ref SPI_GetCurrentMode() function to the SPI peripheral driver.

[pub/USBasp.git] / Projects / MIDIToneGenerator / makefile

diff --git a/Projects/MIDIToneGenerator/makefile b/Projects/MIDIToneGenerator/makefile
index 815f4a7..fbabbf7 100644 (file)
--- a/Projects/MIDIToneGenerator/makefile
+++ b/Projects/MIDIToneGenerator/makefile
@@ -63,6 +63,10 @@
 MCU = at90usb1287\r
 \r
 \r
+# Target architecture (see library "Board Types" documentation).\r
+ARCH = AVR8\r
+\r
+\r
 # Target board (see library "Board Types" documentation, NONE for projects not requiring\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called\r
 # "Board" inside the application directory.\r
@@ -75,8 +79,8 @@ BOARD = USBKEY
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done\r
 #     automatically to create a 32-bit value in your source code.\r
 #\r
-#     This will be an integer division of F_CLOCK below, as it is sourced by\r
-#     F_CLOCK after it has run through any CPU prescalers. Note that this value\r
+#     This will be an integer division of F_USB below, as it is sourced by\r
+#     F_USB after it has run through any CPU prescalers. Note that this value\r
 #     does not *change* the processor frequency - it should merely be updated to\r
 #     reflect the processor speed set externally so that the code can use accurate\r
 #     software delays.\r
@@ -84,7 +88,7 @@ F_CPU = 8000000
 \r
 \r
 # Input clock frequency.\r
-#     This will define a symbol, F_CLOCK, in all source code files equal to the\r
+#     This will define a symbol, F_USB, in all source code files equal to the\r
 #     input clock frequency (before any prescaling is performed) in Hz. This value may\r
 #     differ from F_CPU if prescaling is used on the latter, and is required as the\r
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed\r
@@ -94,7 +98,7 @@ F_CPU = 8000000
 #\r
 #     If no clock division is performed on the input clock inside the AVR (via the\r
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r
-F_CLOCK = $(F_CPU)\r
+F_USB = $(F_CPU)\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
@@ -112,12 +116,13 @@ OBJDIR = .
 \r
 \r
 # Path to the LUFA library\r
-LUFA_PATH = ../../\r
+LUFA_PATH = ../..\r
 \r
 \r
 # LUFA library compile-time options and predefined tokens\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r
+LUFA_OPTS += -D ORDERED_EP_CONFIG\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
@@ -179,20 +184,20 @@ CSTANDARD = -std=c99
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL\r
-CDEFS += -DF_CLOCK=$(F_CLOCK)UL\r
-CDEFS += -DBOARD=BOARD_$(BOARD)\r
+CDEFS += -DF_USB=$(F_USB)UL\r
+CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH)\r
 CDEFS += $(LUFA_OPTS)\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS  = -DF_CPU=$(F_CPU)\r
-ADEFS += -DF_CLOCK=$(F_CLOCK)UL\r
+ADEFS += -DF_USB=$(F_USB)UL\r
 ADEFS += -DBOARD=BOARD_$(BOARD)\r
 ADEFS += $(LUFA_OPTS)\r
 \r
 # Place -D or -U options here for C++ sources\r
 CPPDEFS  = -DF_CPU=$(F_CPU)UL\r
-CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL\r
+CPPDEFS += -DF_USB=$(F_USB)UL\r
 CPPDEFS += -DBOARD=BOARD_$(BOARD)\r
 CPPDEFS += $(LUFA_OPTS)\r
 #CPPDEFS += -D__STDC_LIMIT_MACROS\r