From e38eba09344cd0a8a6bb755024ba20036b6c94cc Mon Sep 17 00:00:00 2001 From: James Goppert Date: Sun, 20 Sep 2015 11:17:31 -0400 Subject: [PATCH] cmake: Fix for posix sitl. --- Makefile | 2 +- Tools/sitl_run.sh | 3 ++- src/platforms/posix/drivers/barosim/barosim.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0dbe379548..ea1344a4ef 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ lldb_sitl_ros: posix Tools/sitl_run.sh posix-configs/SITL/init/rc_iris_ros lldb gdb_sitl_quad: posix - Tools/sitl_run.sh posix-configs/SITL/init/rcS lldb + Tools/sitl_run.sh posix-configs/SITL/init/rcS gdb gdb_sitl_plane: posix Tools/sitl_run.sh posix-configs/SITL/init/rc.fixed_wing lldb diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh index 451dca8326..1a7741d6fd 100755 --- a/Tools/sitl_run.sh +++ b/Tools/sitl_run.sh @@ -1,5 +1,6 @@ #!/bin/bash cp Tools/posix_lldbinit build_posix_sitl_simple/src/firmware/posix/.lldbinit +cp Tools/posix.gdbinit build_posix_sitl_simple/src/firmware/posix/.gdbinit cd build_posix_sitl_simple/src/firmware/posix mkdir -p rootfs/fs/microsd mkdir -p rootfs/eeprom @@ -9,7 +10,7 @@ then lldb -- mainapp ../../../../$1 elif [ "$2" == "gdb" ] then - gdb -- mainapp ../../../../$1 + gdb --args mainapp ../../../../$1 else ./mainapp ../../../../$1 fi diff --git a/src/platforms/posix/drivers/barosim/barosim.h b/src/platforms/posix/drivers/barosim/barosim.h index 8eaa0c21f5..bac176d400 100644 --- a/src/platforms/posix/drivers/barosim/barosim.h +++ b/src/platforms/posix/drivers/barosim/barosim.h @@ -80,5 +80,5 @@ extern bool crc4(uint16_t *n_prom); } /* namespace */ /* interface factories */ -extern device::Device *BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum) __attribute__((weak)); +extern device::Device *BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum); typedef device::Device *(*BAROSIM_constructor)(barosim::prom_u &prom_buf, uint8_t busnum);