GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve native library path on dotnet when using plugins

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-17 14:06:47 +02:00
parent 9322a2006a
commit 9a84f9e4ac
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Engine/Engine/NativeInterop.cs
View File

@@ -15,6 +15,7 @@ using System.Runtime.Loader;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using FlaxEngine.Assertions; using FlaxEngine.Assertions;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.IO;
using System.Text; using System.Text;
namespace FlaxEngine.Interop namespace FlaxEngine.Interop
@@ -56,7 +57,21 @@ namespace FlaxEngine.Interop
{ {
if (!loadedNativeLibraries.TryGetValue(libraryName, out IntPtr nativeLibrary)) if (!loadedNativeLibraries.TryGetValue(libraryName, out IntPtr nativeLibrary))
{ {
nativeLibrary = NativeLibrary.Load(nativeLibraryPaths[libraryName], assembly, dllImportSearchPath); if (!nativeLibraryPaths.TryGetValue(libraryName, out var nativeLibraryPath))
{
nativeLibraryPath = libraryName;
// Check if any of the loaded assemblies has matching native module filename
foreach (var e in nativeLibraryPaths)
{
if (string.Equals(Path.GetFileNameWithoutExtension(e.Value), libraryName, StringComparison.Ordinal))
{
nativeLibraryPath = e.Value;
break;
}
}
}
nativeLibrary = NativeLibrary.Load(nativeLibraryPath, assembly, dllImportSearchPath);
loadedNativeLibraries.Add(libraryName, nativeLibrary); loadedNativeLibraries.Add(libraryName, nativeLibrary);
assemblyOwnedNativeLibraries.Add(assembly, libraryName); assemblyOwnedNativeLibraries.Add(assembly, libraryName);
} }