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

Revert "Improvements to SITL to make paths more flexible. (#5181)"

Browse Source 
This reverts commit 699b6a2cb3.
This commit is contained in:
Lorenz Meier
2016-08-05 21:29:49 +02:00
parent bbe3525377
commit 102f5b54d7
72 changed files with 672 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/px4iofirmware/CMakeLists.txt
+3 -3
View File
@@ -63,7 +63,7 @@ px4_join(OUT CMAKE_CXX_FLAGS LIST "${cxx_flags}" GLUE " ")
include_directories(
${include_dirs}
${PX4_BINARY_DIR}/src/modules/systemlib/mixer
${CMAKE_BINARY_DIR}/src/modules/systemlib/mixer
.
)
link_directories(${link_dirs})
@@ -117,10 +117,10 @@ add_dependencies(${fw_io_name}
mixer_gen
)
set(nuttx_export_dir ${PX4_BINARY_DIR}/${config_io_board}/NuttX/nuttx-export)
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${config_io_board}/NuttX/nuttx-export)
set(main_link_flags
"-T${nuttx_export_dir}/build/ld.script"
"-Wl,-Map=${PX4_BINARY_DIR}/${config_io_board}/main.map"
"-Wl,-Map=${CMAKE_BINARY_DIR}/${config_io_board}/main.map"
)
px4_join(OUT main_link_flags LIST ${main_link_flags} GLUE " ")
set_target_properties(${fw_io_name} PROPERTIES LINK_FLAGS ${main_link_flags})