diff options
| author | holger <holger@samsung900.home> | 2014-06-24 19:28:39 +0200 |
|---|---|---|
| committer | holger <holger@samsung900.home> | 2014-06-24 19:28:39 +0200 |
| commit | be33b4b6a56402135e5cfb8b38e0cc0ae8b7d673 (patch) | |
| tree | b95fe2d9a63b20206b6848a7cdb3fe6612535715 /src/modules/uavcan | |
| parent | 4edc432f399297ed6e74685408e80c0640873099 (diff) | |
| download | px4-firmware-be33b4b6a56402135e5cfb8b38e0cc0ae8b7d673.tar.gz px4-firmware-be33b4b6a56402135e5cfb8b38e0cc0ae8b7d673.tar.bz2 px4-firmware-be33b4b6a56402135e5cfb8b38e0cc0ae8b7d673.zip | |
UAVCAN: append to EXTRADEFINES to those given by make cmd line
Diffstat (limited to 'src/modules/uavcan')
| -rw-r--r-- | src/modules/uavcan/module.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/uavcan/module.mk b/src/modules/uavcan/module.mk index ce9f981a8..5ac7019e3 100644 --- a/src/modules/uavcan/module.mk +++ b/src/modules/uavcan/module.mk @@ -52,7 +52,7 @@ SRCS += $(LIBUAVCAN_SRC) INCLUDE_DIRS += $(LIBUAVCAN_INC) # Since actual compiler mode is C++11, the library will default to UAVCAN_CPP11, but it will fail to compile # because this platform lacks most of the standard library and STL. Hence we need to force C++03 mode. -EXTRADEFINES += -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 +override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 # # libuavcan drivers for STM32 @@ -60,8 +60,7 @@ EXTRADEFINES += -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 include $(UAVCAN_DIR)/libuavcan_drivers/stm32/driver/include.mk SRCS += $(LIBUAVCAN_STM32_SRC) INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC) -EXTRADEFINES += -DUAVCAN_STM32_NUTTX \ - -DUAVCAN_STM32_NUM_IFACES=2 +override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=2 # # Invoke DSDL compiler |