Skip to content
Closed
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
9 changes: 9 additions & 0 deletions Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,15 @@ private void AddCarlaServerDependency(ReadOnlyTargetRules Target)
PublicAdditionalLibraries.Add(Path.Combine(LibCarlaInstallPath, "lib", "proj.lib"));
PublicAdditionalLibraries.Add(Path.Combine(LibCarlaInstallPath, "lib", "osm2odr.lib"));
PublicAdditionalLibraries.Add(Path.Combine(LibCarlaInstallPath, "lib", "zlibstatic.lib"));

// DirectX
// 获取LibCarlaInstallPath下的所有dll文件,并添加为依赖
DirectoryInfo di = new DirectoryInfo(Path.Combine(LibCarlaInstallPath, "dll", "DirectX_Runtime"));
FileInfo[] dllFiles = di.GetFiles("*.dll");
foreach (FileInfo file in dllFiles)
{
AddDllDependency(Path.Combine(LibCarlaInstallPath, "dll", "DirectX_Runtime"), file.Name);
}
}
else
{
Expand Down
14 changes: 14 additions & 0 deletions setup.bat
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,20 @@ if exist "%cd%\Build\dependencies\" (
echo DirectX found!
)

rem Unzip DirectX Runtime
if not exist "prerequisites\DirectX_Runtime" (
echo Unzipping DirectX Runtime ...
"prerequisites\7zip\7z.exe" x "prerequisites\DirectX_Runtime.zip" -o"prerequisites\" -y >nul
if not exist "%cd%\Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\dll\DirectX_Runtime" (
mkdir "%cd%\Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\dll\DirectX_Runtime"
) else (
echo "%cd%\Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\dll\DirectX_Runtime" folder already exists.
)
xcopy /q /Y /S /I "prerequisites\DirectX_Runtime\*.*" "%cd%\Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\dll\DirectX_Runtime\"
) else (
echo DirectX Runtime already exists.
)

if not exist "prerequisites\miniconda3\" (
echo Unzipping miniconda...
"prerequisites\7zip\7z.exe" x "prerequisites\miniconda3.zip" -o"prerequisites\" -y >nul
Expand Down
Loading