Browse Source

Fixed option validating code to work with the new parser.

pull/224/head
triton 12 years ago
parent
commit
9b5ddb7e3e
  1. 20
      src/Generator/Driver.cs

20
src/Generator/Driver.cs

@ -69,23 +69,27 @@ namespace CppSharp
for (var i = 0; i < options.LibraryDirs.Count; i++) for (var i = 0; i < options.LibraryDirs.Count; i++)
options.LibraryDirs[i] = Path.GetFullPath(options.LibraryDirs[i]); options.LibraryDirs[i] = Path.GetFullPath(options.LibraryDirs[i]);
#endif
if (options.NoGenIncludeDirs != null) if (options.NoGenIncludeDirs != null)
for (var i = 0; i < options.NoGenIncludeDirs.Count; i++) for (var i = 0; i < options.NoGenIncludeDirs.Count; i++)
options.NoGenIncludeDirs[i] = Path.GetFullPath(options.NoGenIncludeDirs[i]); options.NoGenIncludeDirs[i] = Path.GetFullPath(options.NoGenIncludeDirs[i]);
#endif
if (options.NoGenIncludeDirs != null)
foreach (var incDir in options.NoGenIncludeDirs)
#if OLD_PARSER
options.IncludeDirs.Add(incDir);
#else
options.addIncludeDirs(incDir);
#endif
if (string.IsNullOrWhiteSpace(options.OutputNamespace)) if (string.IsNullOrWhiteSpace(options.OutputNamespace))
options.OutputNamespace = options.LibraryName; options.OutputNamespace = options.LibraryName;
} }
public void Setup() public void Setup()
{ {
ValidateOptions(Options); ValidateOptions(Options);
if (Options.NoGenIncludeDirs != null)
foreach (var incDir in Options.NoGenIncludeDirs)
if (!Options.IncludeDirs.Contains(incDir))
Options.IncludeDirs.Add(incDir);
TypeDatabase.SetupTypeMaps(); TypeDatabase.SetupTypeMaps();
Generator = CreateGeneratorFromKind(Options.GeneratorKind); Generator = CreateGeneratorFromKind(Options.GeneratorKind);

Loading…
Cancel
Save