Browse Source

Fixed the sorting of modules to also work with manually added dependencies.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/914/head
Dimitar Dobrev 9 years ago
parent
commit
27481289d6
  1. 5
      src/Generator/Driver.cs

5
src/Generator/Driver.cs

@ -222,9 +222,6 @@ namespace CppSharp
public void SortModulesByDependencies() public void SortModulesByDependencies()
{ {
if (!Options.DoAllModulesHaveLibraries())
return;
var sortedModules = Options.Modules.TopologicalSort(m => var sortedModules = Options.Modules.TopologicalSort(m =>
{ {
var dependencies = (from library in Context.Symbols.Libraries var dependencies = (from library in Context.Symbols.Libraries
@ -235,7 +232,7 @@ namespace CppSharp
if (m != Options.SystemModule) if (m != Options.SystemModule)
m.Dependencies.Add(Options.SystemModule); m.Dependencies.Add(Options.SystemModule);
m.Dependencies.AddRange(dependencies); m.Dependencies.AddRange(dependencies);
return dependencies; return m.Dependencies;
}); });
Options.Modules.Clear(); Options.Modules.Clear();
Options.Modules.AddRange(sortedModules); Options.Modules.AddRange(sortedModules);

Loading…
Cancel
Save