aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arduino.mk: fixes to obey HAL_BOARD in user's config.mk

Browse Source
This commit is contained in:
Pat Hickey 2012-12-18 13:43:32 -08:00 committed by Andrew Tridgell
parent ba733dcc3e
commit 23d6c79313
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mk/Arduino.mk
View File

@ -247,11 +247,11 @@ endif
# #
# Tool options # Tool options
# #
EXTRAFLAGS ?=
DEFINES = -DF_CPU=$(F_CPU) DEFINES = -DF_CPU=$(F_CPU)
DEFINES += -DARDUINO=$(ARDUINO_VERS) DEFINES += -DARDUINO=$(ARDUINO_VERS)
DEFINES += $(EXTRAFLAGS)
DEFINES += -DSKETCH=\"$(SKETCH)\" DEFINES += -DSKETCH=\"$(SKETCH)\"
DEFINES += $(EXTRAFLAGS) # from user config.mk
DEFINES += -DCONFIG_HAL_BOARD=$(HAL_BOARD)
WARNFLAGS = -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align WARNFLAGS = -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align
WARNFLAGS += -Wwrite-strings -Wformat=2 -Wno-reorder WARNFLAGS += -Wwrite-strings -Wformat=2 -Wno-reorder
DEPFLAGS = -MD -MT $@ DEPFLAGS = -MD -MT $@
@ -439,8 +439,10 @@ CORELIBOBJS :=
EXTRAFLAGS += -DEXCLUDECORE EXTRAFLAGS += -DEXCLUDECORE
endif endif
ifneq ($(HAL_BOARD),) ifeq ($(HAL_BOARD),HAL_BOARD_AVR_SITL)
EXTRAFLAGS += -DCONFIG_HAL_BOARD=$(HAL_BOARD) TOOLCHAIN = NATIVE
else
TOOLCHAIN = AVR
endif endif
################################################################################ ################################################################################
@ -473,8 +475,6 @@ endif
# Targets # Targets
# #
default: apm2
all: $(SKETCHELF) $(SKETCHEEP) $(SKETCHHEX) all: $(SKETCHELF) $(SKETCHEEP) $(SKETCHHEX)
print-%: print-%: