diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 09:24:26 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 09:24:26 +0100 |
| commit | 11e5aad16e4981709b434bd2e63bb116e16d2562 (patch) | |
| tree | 2911ae4d9481450ca04f9c6418013a22a0b6bd09 | |
| parent | 1868343db65c173b6c66e2725823542e747154c8 (diff) | |
| parent | 7faef870c8201696372661e063336069d91123b9 (diff) | |
| download | px4-firmware-11e5aad16e4981709b434bd2e63bb116e16d2562.tar.gz px4-firmware-11e5aad16e4981709b434bd2e63bb116e16d2562.tar.bz2 px4-firmware-11e5aad16e4981709b434bd2e63bb116e16d2562.zip | |
Merge branch 'master' into nuttx_bringup
| m--------- | src/lib/uavcan | 0 | ||||
| -rw-r--r-- | src/modules/uavcan/module.mk | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/uavcan b/src/lib/uavcan -Subproject 8966f970135fb421db31886d6f99ac918594a78 +Subproject 7719f7692aba67f01b6321773bb7be13f23d2f6 diff --git a/src/modules/uavcan/module.mk b/src/modules/uavcan/module.mk index 924b730a2..600cb47f3 100644 --- a/src/modules/uavcan/module.mk +++ b/src/modules/uavcan/module.mk @@ -57,7 +57,7 @@ SRCS += sensors/sensor_bridge.cpp \ # # libuavcan # -include $(PX4_LIB_DIR)/uavcan/libuavcan/include.mk +include $(PX4_LIB_DIR)uavcan/libuavcan/include.mk 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 @@ -67,7 +67,7 @@ override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAV # # libuavcan drivers for STM32 # -include $(PX4_LIB_DIR)/uavcan/libuavcan_drivers/stm32/driver/include.mk +include $(PX4_LIB_DIR)uavcan/libuavcan_drivers/stm32/driver/include.mk SRCS += $(LIBUAVCAN_STM32_SRC) INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC) override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=2 |