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

Build: Fix sqlite compilation and Carla.Build.cs library paths

This commit is contained in:
xavisolesoft 2024-01-25 19:11:43 +01:00
parent 0f68481a09
commit 9ade5ff8bb
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Configure.py
View File

@ -981,16 +981,19 @@ def BuildSQLite():
'/EHsc',
])
obj_path = BUILD_TEMP_PATH / f'{e.name}{OBJ_EXT}'
if C_COMPILER_CLI_TYPE:
if C_COMPILER_CLI_TYPE != 'gnu':
cmd.extend([ e, f'/Fo{obj_path}' ])
else:
cmd.extend([ e, '-o', obj_path ])
LaunchSubprocessImmediate(cmd, log_name = f'sqlite-{e.stem}-build')
objs.append(obj_path)
cmd = [
LIB,
f'/OUT:{SQLITE_LIB_PATH}',
LIB
]
if os.name == 'nt':
cmd.append(f'/OUT:{SQLITE_LIB_PATH}')
else:
cmd.extend(['rsc', SQLITE_LIB_PATH])
cmd.extend(objs)
LaunchSubprocessImmediate(cmd, log_name = 'sqlite-lib-build')

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

@ -177,7 +177,7 @@ public class Carla :
var LibPath = Path.Combine(InstallPath, "lib");
var Candidates = Directory.GetFiles(LibPath, GetLibraryName(pattern));
if (Candidates.Length == 0)
Console.WriteLine(string.Format("Could not find any matching libraries for \"{0}\" using pattern \"{1}\"", name, pattern));
throw new FileNotFoundException(string.Format("Could not find any matching libraries for \"{0}\" using pattern \"{1}\"", name, pattern));
Array.Sort(Candidates);
return Candidates;
};
@ -198,9 +198,7 @@ public class Carla :
var BoostLibraryPatterns = new string[]
{
"boost_atomic*",
"boost_date_time*",
"boost_filesystem*",
"boost_numpy*",
"boost_python*",
"boost_system*",
@ -215,7 +213,10 @@ public class Carla :
}
var SQLiteBuildPath = Path.Combine(DependenciesInstallPath, "sqlite-build");
var SQLiteLibrary = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("sqlite*"))[0];
var SqliteCandidates = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("*sqlite*"));
if (SqliteCandidates.Length == 0)
throw new FileNotFoundException(string.Format("Could not find any matching libraries for SQLite"));
var SQLiteLibrary = SqliteCandidates[0];
var AdditionalLibraries = new List<string>
{
LibCarlaServerPath,
@ -223,7 +224,7 @@ public class Carla :
FindLibraries("rpclib", "rpc")[0],
FindLibraries("xercesc", "xerces-c*")[0],
FindLibraries("proj", "proj")[0],
FindLibraries("zlib", "zlibstatic*")[0],
FindLibraries("zlib", IsWindows ? "zlibstatic*" : "z")[0], //TODO: Fix this, note that here we have libz.a and libz.so, need to disambiguate
};
foreach (var Pattern in BoostLibraryPatterns)

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

@ -190,9 +190,7 @@ public class CarlaTools :
var BoostLibraryPatterns = new string[]
{
"boost_atomic*",
"boost_date_time*",
"boost_filesystem*",
"boost_numpy*",
"boost_python*",
"boost_system*",
@ -215,7 +213,7 @@ public class CarlaTools :
}
var SQLiteBuildPath = Path.Combine(DependenciesInstallPath, "sqlite-build");
var SQLiteLibraryCandidates = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("sqlite*"));
var SQLiteLibraryCandidates = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("*sqlite*"));
if (SQLiteLibraryCandidates.Length == 0)
throw new FileNotFoundException("Could not find any matching libraries for SQLite");
var RPCLibCandidates = FindLibraries("rpclib", "rpc");