p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor build script changes and fix install paths in UE .cs files

This commit is contained in:
Marcel Pi 2023-12-20 13:23:32 +01:00
parent 4360198f76
commit 1d34eda29b
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Configure.py
View File

@ -485,16 +485,17 @@ DEFAULT_DEPENDENCIES = [
GitRepository('https://github.com/carla-simulator/recastnavigation.git', tag_or_branch = 'carla')),
]
# @TODO: Use these instead of full boost.
BOOST_DEPENDENCIES_EXPERIMENTAL = [
Dependency(
'boost-asio',
GitRepository('https://github.com/boostorg/asio.git')),
'boost-asio',
GitRepository('https://github.com/boostorg/asio.git')),
Dependency(
'boost-python',
GitRepository('https://github.com/boostorg/python.git')),
'boost-python',
GitRepository('https://github.com/boostorg/python.git')),
Dependency(
'boost-gil',
GitRepository('https://github.com/boostorg/gil.git')),
'boost-gil',
GitRepository('https://github.com/boostorg/gil.git')),
]
CHRONO_DEPENDENCIES = [

24
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
View File

@ -154,7 +154,7 @@ public class Carla :
var LibraryPrefix = IsWindows ? "" : "lib";
var LibrarySuffix = IsWindows ? ".lib" : ".a";
var LibCarlaInstallPath = CarlaInstallPath;
var LibCarlaInstallPath = Path.Combine(CarlaInstallPath, "LibCarla");
var DependenciesInstallPath = CarlaDependenciesPath;
Func<string, string> GetLibraryName = name =>
@ -232,22 +232,12 @@ public class Carla :
GetIncludePath("zlib"),
});
PrivateIncludePaths.Add(LibCarlaIncludePath);
PrivateIncludePaths.AddRange(new string[]
{
GetIncludePath("boost"),
GetIncludePath("rpclib"),
GetIncludePath("xercesc"),
GetIncludePath("sumo"),
GetIncludePath("zlib"),
});
PrivateDefinitions.Add("BOOST_DISABLE_ABI_HEADERS");
PrivateDefinitions.Add("BOOST_TYPE_INDEX_FORCE_NO_RTTI_COMPATIBILITY");
PrivateDefinitions.Add("ASIO_NO_EXCEPTIONS");
PrivateDefinitions.Add("BOOST_NO_EXCEPTIONS");
PrivateDefinitions.Add("LIBCARLA_NO_EXCEPTIONS");
PrivateDefinitions.Add("PUGIXML_NO_EXCEPTIONS");
PublicDefinitions.Add("ASIO_NO_EXCEPTIONS");
PublicDefinitions.Add("BOOST_NO_EXCEPTIONS");
PublicDefinitions.Add("LIBCARLA_NO_EXCEPTIONS");
PublicDefinitions.Add("PUGIXML_NO_EXCEPTIONS");
PublicDefinitions.Add("BOOST_DISABLE_ABI_HEADERS");
PublicDefinitions.Add("BOOST_TYPE_INDEX_FORCE_NO_RTTI_COMPATIBILITY");
}
#if false

2
Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs
View File

@ -164,7 +164,7 @@ public class CarlaTools :
var LibraryPrefix = IsWindows ? "" : "lib";
var LibrarySuffix = IsWindows ? ".lib" : ".a";
var LibCarlaInstallPath = CarlaInstallPath;
var LibCarlaInstallPath = Path.Combine(CarlaInstallPath, "LibCarla");
var DependenciesInstallPath = CarlaDependenciesPath;
Func<string, string> GetLibraryName = name =>