Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #384 from DolbyIO/dll_path_fix
Browse files Browse the repository at this point in the history
Fix DLL loading on UE4
  • Loading branch information
Kuba Audykowicz authored Sep 4, 2023
2 parents 4f9efa2 + 8303dd6 commit a4b6aff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions DolbyIO/Source/Private/DolbyIOModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class FDolbyIOModule final : public IModuleInterface
[](std::size_t Count, std::size_t Al) { return ::operator new(Count, static_cast<std::align_val_t>(Al)); },
::operator delete,
[](void* Ptr, std::size_t Al) { ::operator delete(Ptr, static_cast<std::align_val_t>(Al)); }};
BaseDir = FPaths::Combine(BaseDir, "bin");
BaseDir = FPaths::Combine(BaseDir, TEXT("bin"));
LoadDll(BaseDir, "avutil-57.dll");
LoadDll(BaseDir, "avcodec-59.dll");
LoadDll(BaseDir, "dvclient.dll");
Expand All @@ -39,13 +39,13 @@ class FDolbyIOModule final : public IModuleInterface
LoadDll(BaseDir, "video_processor.dll");
dolbyio::comms::plugin::video_processor::set_app_allocator(Allocator);
#elif PLATFORM_MAC
BaseDir = FPaths::Combine(BaseDir, "lib");
BaseDir = FPaths::Combine(BaseDir, TEXT("lib"));
LoadDll(BaseDir, "libdolbyio_comms_media.dylib");
LoadDll(BaseDir, "libdolbyio_comms_sdk.dylib");
LoadDll(BaseDir, "libvideo_processor.dylib");
#elif PLATFORM_LINUX
BaseDir += "-ubuntu-20.04-clang10-libc++10";
BaseDir = FPaths::Combine(BaseDir, "lib");
BaseDir = FPaths::Combine(BaseDir, TEXT("lib"));
LoadDll(BaseDir, "libavutil.so.57");
LoadDll(BaseDir, "libavcodec.so.59");
LoadDll(BaseDir, "libavformat.so.59");
Expand Down

0 comments on commit a4b6aff

Please sign in to comment.