Browse Source

Merge pull request #608 from grbd/master

Thank you very much.
pull/611/head
Dimitar Dobrev 10 years ago
parent
commit
2eeaa67712
  1. 26
      src/Runtime/SymbolResolver.cs

26
src/Runtime/SymbolResolver.cs

@ -57,9 +57,33 @@ namespace CppSharp @@ -57,9 +57,33 @@ namespace CppSharp
public static IntPtr LoadImage (ref string name)
{
var pathvalues = Environment.GetEnvironmentVariable("PATH");
foreach (var format in formats)
{
var attempted = System.IO.Path.Combine(Environment.CurrentDirectory, string.Format (format, name));
// Search the Current or specified directory for the library
string filename = string.Format(format, name);
string attempted = System.IO.Path.Combine(Environment.CurrentDirectory, filename);
if (!System.IO.File.Exists(attempted))
{
// Search the Path directories for the library
if (pathvalues == null)
continue;
foreach (var path in pathvalues.Split(System.IO.Path.PathSeparator))
{
var fullPath = System.IO.Path.Combine(path, filename);
if (System.IO.File.Exists(fullPath))
{
attempted = fullPath;
break;
}
}
}
if (!System.IO.File.Exists(attempted))
continue;
var ptr = loadImage (attempted);
if (ptr == IntPtr.Zero)

Loading…
Cancel
Save