Browse Source

Only add "runtimes\win-XXX\native" folder to search path on windows.

pull/348/merge
Canming Huang 5 years ago
parent
commit
8af93101e6
  1. 6
      Emgu.CV/PInvoke/CvInvoke.cs

6
Emgu.CV/PInvoke/CvInvoke.cs

@ -89,12 +89,14 @@ namespace Emgu.CV
//var fd = RuntimeInformation.FrameworkDescription;
if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
{
subfolderOptions.Add(Path.Combine("runtimes", "win-x86", "native"));
if (Platform.OperationSystem == Emgu.Util.Platform.OS.Windows)
subfolderOptions.Add(Path.Combine("runtimes", "win-x86", "native"));
subfolderOptions.Add("x86");
}
else if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
{
subfolderOptions.Add(Path.Combine("runtimes", "win-x64", "native"));
if (Platform.OperationSystem == Emgu.Util.Platform.OS.Windows)
subfolderOptions.Add(Path.Combine("runtimes", "win-x64", "native"));
subfolderOptions.Add("x64");
}
else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm)

Loading…
Cancel
Save