Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Fixed hardcoded include path

Browse Source
This commit is contained in:
Pavel Kirienko
2014-05-06 19:42:40 +04:00
parent 7813566e66
commit 7d7a375dd1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/nuttx.mk
+1
View File
@@ -64,6 +64,7 @@ LDSCRIPT += $(NUTTX_EXPORT_DIR)build/ld.script
# Add directories from the NuttX export to the relevant search paths # Add directories from the NuttX export to the relevant search paths
# #
INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include \ INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include \
$(NUTTX_EXPORT_DIR)include/cxx \
$(NUTTX_EXPORT_DIR)arch/chip \ $(NUTTX_EXPORT_DIR)arch/chip \
$(NUTTX_EXPORT_DIR)arch/common $(NUTTX_EXPORT_DIR)arch/common
src/modules/uavcan/module.mk
+3 -3
View File
@@ -48,8 +48,7 @@ SRCS += uavcan_main.cpp \
# #
include $(UAVCAN_DIR)/libuavcan/include.mk include $(UAVCAN_DIR)/libuavcan/include.mk
SRCS += $(LIBUAVCAN_SRC) SRCS += $(LIBUAVCAN_SRC)
# TODO fix include path INCLUDE_DIRS += $(LIBUAVCAN_INC)
INCLUDE_DIRS += $(LIBUAVCAN_INC) /media/storage/px4/Firmware/Build/px4fmu-v2_default.build/nuttx-export/include/cxx/
EXTRADEFINES += -DUAVCAN_MEM_POOL_BLOCK_SIZE=56 \ EXTRADEFINES += -DUAVCAN_MEM_POOL_BLOCK_SIZE=56 \
-DUAVCAN_TOSTRING=0 \ -DUAVCAN_TOSTRING=0 \
-DUAVCAN_CPP_VERSION=UAVCAN_CPP03 \ -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 \
@@ -61,7 +60,8 @@ EXTRADEFINES += -DUAVCAN_MEM_POOL_BLOCK_SIZE=56 \
include $(UAVCAN_DIR)/libuavcan_drivers/stm32/driver/include.mk include $(UAVCAN_DIR)/libuavcan_drivers/stm32/driver/include.mk
SRCS += $(LIBUAVCAN_STM32_SRC) SRCS += $(LIBUAVCAN_STM32_SRC)
INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC) INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC)
EXTRADEFINES += -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=1 EXTRADEFINES += -DUAVCAN_STM32_NUTTX \
-DUAVCAN_STM32_NUM_IFACES=1
# #
# Invoke DSDL compiler # Invoke DSDL compiler