From 2aca94d9f9ff81041d1725ecddb37211e7365b0d Mon Sep 17 00:00:00 2001 From: marcos henrich Date: Thu, 23 May 2013 04:30:47 +0100 Subject: [PATCH] Using Unix path separator --- src/Generator/Generators/CLI/CLISourcesTemplate.cs | 8 ++++---- src/Generator/Passes/CleanUnitPass.cs | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 2fff749c..3d2007cc 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -19,12 +19,12 @@ namespace CppSharp.Generators.CLI { GenerateStart(); - var file = Path.GetFileNameWithoutExtension(TranslationUnit.FileName); + var file = Path.GetFileNameWithoutExtension(TranslationUnit.FileName).Replace('\\', '/'); if (Driver.Options.GenerateName != null) file = Driver.Options.GenerateName(TranslationUnit); - WriteLine("#include \"{0}{1}.h\"", file); + WriteLine("#include \"{0}.h\"", file); GenerateForwardReferenceHeaders(); @@ -69,7 +69,7 @@ namespace CppSharp.Generators.CLI if (includeName == Path.GetFileNameWithoutExtension(((TextTemplate) this).TranslationUnit.FileName)) continue; - includes.Add(string.Format("#include \"{0}.h\"", includeName)); + includes.Add(string.Format("#include \"{0}.h\"", includeName.Replace('\\', '/'))); } foreach (var include in Includes) @@ -377,7 +377,7 @@ namespace CppSharp.Generators.CLI WriteStartBraceIndent(); 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(); } diff --git a/src/Generator/Passes/CleanUnitPass.cs b/src/Generator/Passes/CleanUnitPass.cs index 30fd2581..e6b917cb 100644 --- a/src/Generator/Passes/CleanUnitPass.cs +++ b/src/Generator/Passes/CleanUnitPass.cs @@ -35,8 +35,10 @@ namespace CppSharp.Passes shortestIncludePath = inc; } - return DriverOptions.IncludePrefix + includePath = DriverOptions.IncludePrefix + shortestIncludePath.TrimStart(new char[] { '\\', '/' }); + + return includePath.Replace('\\', '/'); } }