File tree Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ USE_UNITY=true
1919USE_ROS2=false
2020
2121EDITOR_FLAGS=" "
22+ ROS2_EDITOR_FLAGS=" "
23+
2224
2325GDB=
2426RHI=" -vulkan"
@@ -70,6 +72,9 @@ while [[ $# -gt 0 ]]; do
7072 shift ;;
7173 --ros2 )
7274 USE_ROS2=true;
75+ # In conjuncation with ROS2 MallocBinned has problems:
76+ # enforce using AnsiMalloc calls (see https://forums.unrealengine.com/t/dealing-with-allocator-mismatches-with-external-libraries/1416830)
77+ ROS2_EDITOR_FLAGS=" -ansimalloc"
7378 shift ;;
7479 --no-unity )
7580 USE_UNITY=false
208213if ${LAUNCH_UE4_EDITOR} ; then
209214
210215 log " Launching UE4Editor..."
211- ${GDB} ${UE4_ROOT} /Engine/Binaries/Linux/UE4Editor " ${PWD} /CarlaUE4.uproject" ${RHI} ${EDITOR_FLAGS}
216+ ${GDB} ${UE4_ROOT} /Engine/Binaries/Linux/UE4Editor " ${PWD} /CarlaUE4.uproject" ${RHI} ${EDITOR_FLAGS} ${ROS2_EDITOR_FLAGS}
212217
213218else
214219
Original file line number Diff line number Diff line change @@ -74,6 +74,13 @@ cat >> CarlaUE4.sh <<EOF
7474"/opt/carla-simulator/CarlaUE4/Binaries/Linux/CarlaUE4-Linux-Shipping" CarlaUE4 \$ @
7575EOF
7676
77+ # Updating CarlaUE4ROS2.sh script
78+ rm CarlaUE4ROS2.sh
79+ cat >> CarlaUE4ROS2.sh << EOF
80+ #!/bin/sh
81+ "/opt/carla-simulator/CarlaUE4/Binaries/Linux/CarlaUE4-Linux-Shipping" CarlaUE4 -ansimalloc \$ @
82+ EOF
83+
7784# Making debian package to install Carla in /opt folder
7885rm Makefile
7986
You can’t perform that action at this time.
0 commit comments