|
|
|
@ -230,8 +230,8 @@ namespace CppSharp |
|
|
|
foreach (var undefine in module.Undefines) |
|
|
|
foreach (var undefine in module.Undefines) |
|
|
|
options.addUndefines(undefine); |
|
|
|
options.addUndefines(undefine); |
|
|
|
|
|
|
|
|
|
|
|
foreach (var library in module.Libraries) |
|
|
|
foreach (var libraryDir in module.LibraryDirs) |
|
|
|
options.addLibraryDirs(library); |
|
|
|
options.addLibraryDirs(libraryDir); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return options; |
|
|
|
return options; |
|
|
|
@ -267,9 +267,14 @@ namespace CppSharp |
|
|
|
|
|
|
|
|
|
|
|
public bool ParseLibraries() |
|
|
|
public bool ParseLibraries() |
|
|
|
{ |
|
|
|
{ |
|
|
|
foreach (var library in Options.Modules.SelectMany(m => m.Libraries)) |
|
|
|
foreach (var module in Options.Modules) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (this.Symbols.Libraries.Any(l => l.FileName == library)) |
|
|
|
foreach (var libraryDir in module.LibraryDirs) |
|
|
|
|
|
|
|
Options.addLibraryDirs(libraryDir); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var library in module.Libraries) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (Symbols.Libraries.Any(l => l.FileName == library)) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
var parser = new ClangParser(); |
|
|
|
var parser = new ClangParser(); |
|
|
|
@ -285,6 +290,7 @@ namespace CppSharp |
|
|
|
res.Library.Dispose(); |
|
|
|
res.Library.Dispose(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|