hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slight cleanups to the architecture specific makefile templates to make the common configuration sections as identical as possible.

Browse Source
Dean Camera 14 years ago
parent e009aafe25
commit 4b1f6cac75
2 changed files with 12 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      LUFA/CodeTemplates/makefile_template.avr8
  2. 9
      LUFA/CodeTemplates/makefile_template.uc3

18
LUFA/CodeTemplates/makefile_template.avr8
Unescape View File

@ -133,6 +133,7 @@ SRC = $(TARGET).c \
$(LUFA_SRC_USBCLASS) $(LUFA_SRC_USBCLASS)
### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ### ### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ###
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)
CPPSRC = CPPSRC =
@ -153,13 +154,6 @@ ASRC =
OPT = s OPT = s
# Debugging format.
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
# AVR Studio 4.10 requires dwarf-2.
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
DEBUG = dwarf-2
# List any extra directories to look for include files here. # List any extra directories to look for include files here.
# Each directory must be seperated by a space. # Each directory must be seperated by a space.
# Use forward slashes for directory separators. # Use forward slashes for directory separators.
@ -172,7 +166,7 @@ EXTRAINCDIRS = $(LUFA_PATH)/
# gnu89 = c89 plus GCC extensions # gnu89 = c89 plus GCC extensions
# c99 = ISO C99 standard (not yet fully implemented) # c99 = ISO C99 standard (not yet fully implemented)
# gnu99 = c99 plus GCC extensions # gnu99 = c99 plus GCC extensions
CSTANDARD = -std=c99 CSTANDARD = -std=gnu99
# Place -D or -U options here for C sources # Place -D or -U options here for C sources
@ -196,10 +190,14 @@ CPPDEFS += -DF_USB=$(F_USB)UL
CPPDEFS += -DBOARD=BOARD_$(BOARD) CPPDEFS += -DBOARD=BOARD_$(BOARD)
CPPDEFS += -DARCH=ARCH_$(ARCH) CPPDEFS += -DARCH=ARCH_$(ARCH)
CPPDEFS += $(LUFA_OPTS) CPPDEFS += $(LUFA_OPTS)
#CPPDEFS += -D__STDC_LIMIT_MACROS
#CPPDEFS += -D__STDC_CONSTANT_MACROS
# Debugging format.
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
# AVR Studio 4.10 requires dwarf-2.
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
DEBUG = dwarf-2
#---------------- Compiler Options C ---------------- #---------------- Compiler Options C ----------------
# -g*: generate debugging information # -g*: generate debugging information

9
LUFA/CodeTemplates/makefile_template.uc3
Unescape View File

@ -76,7 +76,7 @@ F_CPU = ### INSERT PRESCALED SYSTEM CLOCK SPEED HERE, IN HZ ###
# clock rate. # clock rate.
# #
# For the UC3 chips, this should be equal to 48MHz or 96MHz. # For the UC3 chips, this should be equal to 48MHz or 96MHz.
F_USB = 48000000 F_USB = ### INSERT CLOCK TO USB MODULE HERE, IN HZ ###
# Output format. (can be srec, ihex, binary) # Output format. (can be srec, ihex, binary)
@ -132,10 +132,6 @@ ASRC =
OPT = s OPT = s
# Debugging level.
DEBUG = 3
# List any extra directories to look for include files here. # List any extra directories to look for include files here.
# Each directory must be seperated by a space. # Each directory must be seperated by a space.
# Use forward slashes for directory separators. # Use forward slashes for directory separators.
@ -174,6 +170,9 @@ CPPDEFS += -DARCH=ARCH_$(ARCH)
CPPDEFS += $(LUFA_OPTS) CPPDEFS += $(LUFA_OPTS)
# Debugging level.
DEBUG = 3
#---------------- Compiler Options C ---------------- #---------------- Compiler Options C ----------------
# -g*: generate debugging information # -g*: generate debugging information

Write Preview
Loading…
Cancel
Save