Browse Source

build: added APM_BUILD_DIRECTORY define to build

this makes it possible to have different default parameter values for
different vehicle types in libraries, as long as you use the makefile
based build
master
Andrew Tridgell 11 years ago
parent
commit
f31183f22d
  1. 2
      mk/board_avr.mk
  2. 2
      mk/board_avr_sitl.mk
  3. 2
      mk/board_flymaple.mk
  4. 2
      mk/px4_targets.mk

2
mk/board_avr.mk

@ -7,7 +7,7 @@ include $(MK_DIR)/find_tools.mk @@ -7,7 +7,7 @@ include $(MK_DIR)/find_tools.mk
# Tool options
#
DEFINES = -DF_CPU=$(F_CPU)
DEFINES += -DSKETCH=\"$(SKETCH)\"
DEFINES += -DSKETCH=\"$(SKETCH)\" -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKETCH)
DEFINES += $(EXTRAFLAGS) # from user config.mk
DEFINES += -DCONFIG_HAL_BOARD=$(HAL_BOARD)
WARNFLAGS = -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align

2
mk/board_avr_sitl.mk

@ -6,7 +6,7 @@ include $(MK_DIR)/find_tools.mk @@ -6,7 +6,7 @@ include $(MK_DIR)/find_tools.mk
# Tool options
#
DEFINES = -DF_CPU=$(F_CPU)
DEFINES += -DSKETCH=\"$(SKETCH)\" -DSKETCHNAME="\"$(SKETCH)\""
DEFINES += -DSKETCH=\"$(SKETCH)\" -DSKETCHNAME="\"$(SKETCH)\"" -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKETCH)
DEFINES += $(EXTRAFLAGS) # from user config.mk
DEFINES += -DCONFIG_HAL_BOARD=$(HAL_BOARD)
WARNFLAGS = -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align

2
mk/board_flymaple.mk

@ -32,7 +32,7 @@ LD_MEM_DIR := sram_64k_flash_512k @@ -32,7 +32,7 @@ LD_MEM_DIR := sram_64k_flash_512k
# Tool options
#
DEFINES = -DF_CPU=$(F_CPU) -DMCU_$(MCU) -DBOARD_$(BOARD) -DERROR_LED_PORT=GPIOA -DERROR_LED_PIN=5 -DVECT_TAB_FLASH
DEFINES += -DSKETCH=\"$(SKETCH)\"
DEFINES += -DSKETCH=\"$(SKETCH)\" -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKETCH)
DEFINES += $(EXTRAFLAGS) # from user config.mk
DEFINES += -DCONFIG_HAL_BOARD=$(HAL_BOARD)
WARNFLAGS = -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align -Wno-psabi

2
mk/px4_targets.mk

@ -36,7 +36,7 @@ EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\"" @@ -36,7 +36,7 @@ EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\""
PX4_V1_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v1_APM.mk
PX4_V2_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v2_APM.mk
SKETCHFLAGS=$(SKETCHLIBINCLUDES) -I$(PWD) -DARDUPILOT_BUILD -DCONFIG_HAL_BOARD=HAL_BOARD_PX4 -DSKETCHNAME="\\\"$(SKETCH)\\\"" -DSKETCH_MAIN=ArduPilot_main
SKETCHFLAGS=$(SKETCHLIBINCLUDES) -I$(PWD) -DARDUPILOT_BUILD -DCONFIG_HAL_BOARD=HAL_BOARD_PX4 -DSKETCHNAME="\\\"$(SKETCH)\\\"" -DSKETCH_MAIN=ArduPilot_main -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKETCH)
WARNFLAGS = -Wno-psabi -Wno-packed

Loading…
Cancel
Save