diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-23 14:34:53 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-23 14:34:53 +0100 |
| commit | 84d744707d07ae60dcf201a828d529057061fe47 (patch) | |
| tree | b0272221e74099e2c450313abeab4c1b44e54d08 /src | |
| parent | ba4b8c8e003d5dba3b547f4b75407b584df5d965 (diff) | |
| download | px4-firmware-84d744707d07ae60dcf201a828d529057061fe47.tar.gz px4-firmware-84d744707d07ae60dcf201a828d529057061fe47.tar.bz2 px4-firmware-84d744707d07ae60dcf201a828d529057061fe47.zip | |
UAVCAN: Move into lib directory
Diffstat (limited to 'src')
| 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 new file mode 160000 +Subproject 1efd24427539fa332a15151143466ec760fa5ff diff --git a/src/modules/uavcan/module.mk b/src/modules/uavcan/module.mk index f92bc754f..e5d30f6c4 100644 --- a/src/modules/uavcan/module.mk +++ b/src/modules/uavcan/module.mk @@ -57,7 +57,7 @@ SRCS += sensors/sensor_bridge.cpp \ # # libuavcan # -include $(UAVCAN_DIR)/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 $(UAVCAN_DIR)/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 |