fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-28 08:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1103 from hsteinhaus/uavcan-ardupilot

Browse Source 
UAVCAN: append to EXTRADEFINES to those given by make cmd line
This commit is contained in:
Lorenz Meier
2014-07-01 00:33:55 +02:00
parent 4edc432f39 be33b4b6a5
commit c4d40b8d28
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uavcan/module.mk
+2 -3
View File
@@ -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