Skip to content

fix: compile on Ubuntu 21.10 and Unreal 4.27.2 #4365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: compile on Ubuntu 21.10 and Unreal 4.27.2 #4365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
911324f
fix: compile on Ubuntu 21.10 and Unreal 4.27.2
russkel Feb 22, 2022
9fd7576
fix: export the UnrealImageCapture class
russkel Feb 28, 2022
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
13 changes: 7 additions & 6 deletions Unreal/Plugins/AirSim/Source/AirSim.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

using UnrealBuildTool;
using System;
using System.IO;

public class AirSim : ModuleRules
Expand Down Expand Up @@ -105,12 +106,12 @@ private void AddOSLibDependencies(ReadOnlyTargetRules Target)
PublicAdditionalLibraries.Add("dxguid.lib");
}

if (Target.Platform == UnrealTargetPlatform.Linux)
{
// needed when packaging
PublicAdditionalLibraries.Add("stdc++");
PublicAdditionalLibraries.Add("supc++");
}
if (Target.Platform == UnrealTargetPlatform.Linux)
{
// needed when packaging
// PublicAdditionalLibraries.Add("stdc++");
// PublicAdditionalLibraries.Add("supc++");
Comment on lines +111 to +113
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commented out code should be deleted; it can be found in source history if need be

}
}

static void CopyFileIfNewer(string srcFilePath, string destFolder)
Expand Down
2 changes: 1 addition & 1 deletion Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "common/ImageCaptureBase.hpp"
#include "common/common_utils/UniqueValueMap.hpp"

class UnrealImageCapture : public msr::airlib::ImageCaptureBase
class AIRSIM_API UnrealImageCapture : public msr::airlib::ImageCaptureBase
{
public:
typedef msr::airlib::ImageCaptureBase::ImageType ImageType;
Expand Down
6 changes: 3 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
#!/bin/bash

# get path of current script: https://stackoverflow.com/a/39340259/207661
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down Expand Up @@ -62,8 +62,8 @@ else
export CC="gcc-8"
export CXX="g++-8"
else
export CC="clang-8"
export CXX="clang++-8"
export CC="clang-11"
export CXX="clang++-11"
fi
fi

Expand Down
4 changes: 2 additions & 2 deletions cmake/cmake-modules/CommonSetup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ macro(CommonSetup)
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wno-documentation -Wno-unknown-warning-option ${CMAKE_CXX_FLAGS}")
find_package(LLVM REQUIRED CONFIG)
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -lc++fs -ferror-limit=10")
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -ferror-limit=10")
else()
set(CXX_EXP_LIB "-lstdc++fs -fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
set(CXX_EXP_LIB "-fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
endif ()
endif ()

Expand Down
12 changes: 6 additions & 6 deletions setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ else #linux
software-properties-common \
wget \
libvulkan1 \
vulkan-utils
vulkan-tools
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change in dependencies is breaking the ubuntu 18.04 build:

+ sudo apt-get -y install --no-install-recommends lsb-release rsync software-properties-common wget libvulkan1 vulkan-tools
Reading package lists...
Building dependency tree...
Reading state information...
E: Unable to locate package vulkan-tools
Error: Process completed with exit code 100.

Can you make this logic conditional or change it to a dependency that both ubuntu 21.10 and 18.04 share?


#install clang and build tools
VERSION=$(lsb_release -rs | cut -d. -f1)
# Since Ubuntu 17 clang is part of the core repository
# See https://packages.ubuntu.com/search?keywords=clang-8
if [ "$VERSION" -lt "17" ]; then
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-get update
fi
sudo apt-get install -y clang-8 clang++-8 libc++-8-dev libc++abi-8-dev
# if [ "$VERSION" -lt "17" ]; then
# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
# sudo apt-get update
# fi
sudo apt-get install -y clang-11 clang++-11 libc++-11-dev libc++abi-11-dev
fi

if ! which cmake; then
Expand Down