Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Util/BuildTools/BuildCarlaUE4.bat
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ if not "%1"=="" (
rem remove quotes from arguments
set EDITOR_FLAGS=%EDITOR_FLAGS:"=%

rem Forward ROS2 runtime flags to the UE4 editor command line
if %USE_ROS2% == true (
set EDITOR_FLAGS=%EDITOR_FLAGS% --ros2
)

if %REMOVE_INTERMEDIATE% == false (
if %LAUNCH_UE4_EDITOR% == false (
if %BUILD_UE4_EDITOR% == false (
Expand Down
16 changes: 15 additions & 1 deletion Util/BuildTools/BuildCarlaUE4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ USE_PYTORCH=false
USE_UNITY=true
USE_ROS2=false
CHRONO_PATH=""
DDS_MIDDLEWARE=""

EDITOR_FLAGS=""

GDB=
RHI="-vulkan"

OPTS=`getopt -o h --long help,build,rebuild,launch,clean,hard-clean,gdb,opengl,carsim,pytorch,chrono,chrono-path:,ros2,no-simready,no-unity,editor-flags: -n 'parse-options' -- "$@"`
OPTS=`getopt -o h --long help,build,rebuild,launch,clean,hard-clean,gdb,opengl,carsim,pytorch,chrono,chrono-path:,ros2,dds-middleware:,no-simready,no-unity,editor-flags: -n 'parse-options' -- "$@"`

eval set -- "$OPTS"

Expand Down Expand Up @@ -73,6 +74,9 @@ while [[ $# -gt 0 ]]; do
--ros2 )
USE_ROS2=true;
shift ;;
--dds-middleware )
DDS_MIDDLEWARE=$2;
shift 2 ;;
--no-simready )
USE_SIMREADY=false
shift ;;
Expand All @@ -89,6 +93,16 @@ while [[ $# -gt 0 ]]; do
esac
done

# Forward ROS2 runtime flags to the UE4 editor command line.
# --ros2 is consumed above for build-time config (OptionalModules.ini);
# the editor also needs it as a runtime flag for CarlaSettings.
if ${USE_ROS2} ; then
EDITOR_FLAGS="${EDITOR_FLAGS} --ros2"
fi
if [ -n "${DDS_MIDDLEWARE}" ] ; then
EDITOR_FLAGS="${EDITOR_FLAGS} --dds-middleware=${DDS_MIDDLEWARE}"
fi

# ==============================================================================
# -- Set up environment --------------------------------------------------------
# ==============================================================================
Expand Down
Loading