Browse Source

Using Unix path separator

pull/1/head
marcos henrich 12 years ago
parent
commit
2aca94d9f9
  1. 8
      src/Generator/Generators/CLI/CLISourcesTemplate.cs
  2. 4
      src/Generator/Passes/CleanUnitPass.cs

8
src/Generator/Generators/CLI/CLISourcesTemplate.cs

@ -19,12 +19,12 @@ namespace CppSharp.Generators.CLI
{ {
GenerateStart(); GenerateStart();
var file = Path.GetFileNameWithoutExtension(TranslationUnit.FileName); var file = Path.GetFileNameWithoutExtension(TranslationUnit.FileName).Replace('\\', '/');
if (Driver.Options.GenerateName != null) if (Driver.Options.GenerateName != null)
file = Driver.Options.GenerateName(TranslationUnit); file = Driver.Options.GenerateName(TranslationUnit);
WriteLine("#include \"{0}{1}.h\"", file); WriteLine("#include \"{0}.h\"", file);
GenerateForwardReferenceHeaders(); GenerateForwardReferenceHeaders();
@ -69,7 +69,7 @@ namespace CppSharp.Generators.CLI
if (includeName == Path.GetFileNameWithoutExtension(((TextTemplate) this).TranslationUnit.FileName)) if (includeName == Path.GetFileNameWithoutExtension(((TextTemplate) this).TranslationUnit.FileName))
continue; continue;
includes.Add(string.Format("#include \"{0}.h\"", includeName)); includes.Add(string.Format("#include \"{0}.h\"", includeName.Replace('\\', '/')));
} }
foreach (var include in Includes) foreach (var include in Includes)
@ -377,7 +377,7 @@ namespace CppSharp.Generators.CLI
WriteStartBraceIndent(); WriteStartBraceIndent();
var paramNames = @params.Select(param => param.Name).ToList(); var paramNames = @params.Select(param => param.Name).ToList();
WriteLine("_{0}({1});", @event.Name, string.Join(" ", paramNames)); WriteLine("_{0}({1});", @event.Name, string.Join(", ", paramNames));
WriteCloseBraceIndent(); WriteCloseBraceIndent();
} }

4
src/Generator/Passes/CleanUnitPass.cs

@ -35,8 +35,10 @@ namespace CppSharp.Passes
shortestIncludePath = inc; shortestIncludePath = inc;
} }
return DriverOptions.IncludePrefix includePath = DriverOptions.IncludePrefix
+ shortestIncludePath.TrimStart(new char[] { '\\', '/' }); + shortestIncludePath.TrimStart(new char[] { '\\', '/' });
return includePath.Replace('\\', '/');
} }
} }

Loading…
Cancel
Save