ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DynamicLibraryImportResolver (linux): better search paths

This commit is contained in:
Asnivor 2019-01-26 15:53:05 +00:00
parent 78e2e2ee0c
commit 61d9d2891e
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
View File

@ -17,10 +17,14 @@ namespace BizHawk.Common.BizInvoke
if (_p == IntPtr.Zero) throw new InvalidOperationException("null pointer returned by LoadPlatformSpecific"); if (_p == IntPtr.Zero) throw new InvalidOperationException("null pointer returned by LoadPlatformSpecific");
} }
private string[] SearchPaths = new string[] private string[] RelativeSearchPaths = new string[]
{ {
"/", "/",
"/dll/", "/dll/"
};
private string[] AbsoluteSearchPaths = new string[]
{
"/usr/lib/", "/usr/lib/",
"/usr/lib/bizhawk/" "/usr/lib/bizhawk/"
}; };
@ -34,13 +38,23 @@ namespace BizHawk.Common.BizInvoke
string currDir = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:", ""); string currDir = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:", "");
string dll = dllName; string dll = dllName;
foreach (var p in SearchPaths) foreach (var p in RelativeSearchPaths)
{ {
dll = currDir + p + dllName; dll = currDir + p + dllName;
if (System.IO.File.Exists(dll)) if (System.IO.File.Exists(dll))
{ {
dllName = dll; dllName = dll;
break; return;
}
}
foreach (var p in AbsoluteSearchPaths)
{
dll = p + dllName;
if (System.IO.File.Exists(dll))
{
dllName = dll;
return;
} }
} }
} }