themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improve native resolutions

Browse source
This commit is contained in:
Luke 2021-11-24 21:32:11 +10:00
parent d439b3db1c
commit f48dda3ae3
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TShockAPI/TShock.cs
View file

@ -203,17 +203,20 @@ namespace TShockAPI
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
var osx = Path.Combine(Environment.CurrentDirectory, "runtimes", "osx-x64");
matches = Directory.GetFiles(osx, "*" + libraryName + "*", SearchOption.AllDirectories);
if(Directory.Exists(osx))
matches = Directory.GetFiles(osx, "*" + libraryName + "*", SearchOption.AllDirectories);
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var lib64 = Path.Combine(Environment.CurrentDirectory, "runtimes", "linux-x64");
matches = Directory.GetFiles(lib64, "*" + libraryName + "*", SearchOption.AllDirectories);
if (Directory.Exists(lib64))
matches = Directory.GetFiles(lib64, "*" + libraryName + "*", SearchOption.AllDirectories);
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
var x64 = Path.Combine(Environment.CurrentDirectory, "runtimes", "win-x64");
matches = Directory.GetFiles(x64, "*" + libraryName + "*", SearchOption.AllDirectories);
if (Directory.Exists(x64))
matches = Directory.GetFiles(x64, "*" + libraryName + "*", SearchOption.AllDirectories);
}
if (matches.Count() == 0)
@ -221,6 +224,8 @@ namespace TShockAPI
matches = Directory.GetFiles(Environment.CurrentDirectory, "*" + libraryName + "*");
}
Debug.WriteLine($"Looking for `{libraryName}` with {matches.Count()} match(es)");
var handle = IntPtr.Zero;
if (matches.Count() == 1)