diff options
author | Dean Camera <[email protected]> | 2009-06-19 04:34:35 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-06-19 04:34:35 +0000 |
commit | beb0b2bda0c45e958e88933a055d409e42fa0a0b (patch) | |
tree | 2a8db61b0ccdee8fcfb3d1ef551bf76049fb28bf /Demos/Host/LowLevel | |
parent | dfa547164a1f9aefe202041e61075852f6e47191 (diff) | |
download | qmk_firmware-beb0b2bda0c45e958e88933a055d409e42fa0a0b.tar.gz qmk_firmware-beb0b2bda0c45e958e88933a055d409e42fa0a0b.zip |
Move LUFA compile time options to a new section in the application makefiles for clarity.
Diffstat (limited to 'Demos/Host/LowLevel')
-rw-r--r-- | Demos/Host/LowLevel/CDCHost/makefile | 11 | ||||
-rw-r--r-- | Demos/Host/LowLevel/GenericHIDHost/makefile | 12 | ||||
-rw-r--r-- | Demos/Host/LowLevel/KeyboardHost/makefile | 11 | ||||
-rw-r--r-- | Demos/Host/LowLevel/KeyboardHostWithParser/makefile | 11 | ||||
-rw-r--r-- | Demos/Host/LowLevel/MassStorageHost/makefile | 13 | ||||
-rw-r--r-- | Demos/Host/LowLevel/MouseHost/makefile | 12 | ||||
-rw-r--r-- | Demos/Host/LowLevel/MouseHostWithParser/makefile | 11 | ||||
-rw-r--r-- | Demos/Host/LowLevel/StillImageHost/makefile | 11 |
8 files changed, 67 insertions, 25 deletions
diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile index dfbefbb800..de217dff83 100644 --- a/Demos/Host/LowLevel/CDCHost/makefile +++ b/Demos/Host/LowLevel/CDCHost/makefile @@ -122,6 +122,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -182,9 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DUSB_HOST_ONLY -DNO_STREAM_CALLBACKS
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
# Place -D or -U options here for ASM sources
diff --git a/Demos/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile index a07acb4389..a117578a3f 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/makefile +++ b/Demos/Host/LowLevel/GenericHIDHost/makefile @@ -122,6 +122,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -183,9 +190,8 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+
# Place -D or -U options here for ASM sources
ADEFS = -DF_CPU=$(F_CPU)
diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile index 6e005da0a7..ef77810ff5 100644 --- a/Demos/Host/LowLevel/KeyboardHost/makefile +++ b/Demos/Host/LowLevel/KeyboardHost/makefile @@ -122,6 +122,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -182,9 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DUSB_HOST_ONLY -DNO_STREAM_CALLBACKS
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
# Place -D or -U options here for ASM sources
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile index 393551268e..faf8910f6b 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile @@ -122,6 +122,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -184,9 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DUSB_HOST_ONLY -DNO_STREAM_CALLBACKS
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
# Place -D or -U options here for ASM sources
diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile index 709f42f617..f236eed2b6 100644 --- a/Demos/Host/LowLevel/MassStorageHost/makefile +++ b/Demos/Host/LowLevel/MassStorageHost/makefile @@ -122,6 +122,14 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -183,10 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-CDEFS += -DUSB_STREAM_TIMEOUT_MS=2000
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
# Place -D or -U options here for ASM sources
diff --git a/Demos/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile index 67e05a63ad..f62697dad9 100644 --- a/Demos/Host/LowLevel/MouseHost/makefile +++ b/Demos/Host/LowLevel/MouseHost/makefile @@ -122,6 +122,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -182,9 +189,8 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+
# Place -D or -U options here for ASM sources
ADEFS = -DF_CPU=$(F_CPU)
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile index 30e40ad45a..caf20df613 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/makefile +++ b/Demos/Host/LowLevel/MouseHostWithParser/makefile @@ -122,6 +122,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -184,9 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
# Place -D or -U options here for ASM sources
diff --git a/Demos/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile index a4428c5656..96eca4258d 100644 --- a/Demos/Host/LowLevel/StillImageHost/makefile +++ b/Demos/Host/LowLevel/StillImageHost/makefile @@ -121,6 +121,13 @@ OBJDIR = . LUFA_PATH = ../../../..
+# LUFA library compile-time options
+LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += NO_STREAM_CALLBACKS
+LUFA_OPTS += USB_HOST_ONLY
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
ConfigDescriptor.c \
@@ -182,9 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
# Place -D or -U options here for ASM sources
|