Merge pull request #27 from ddobrev/master

Fixed finding MinGW symbols; checked the desugared type when visiting pointer types.

src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -275,8 +275,9 @@ namespace CppSharp.Generators.CSharp
 
             var pointee = pointer.Pointee;
 
-            if (pointee.IsPrimitiveType(PrimitiveType.Char) ||
+            Type type = pointee.Desugar();
-                pointee.IsPrimitiveType(PrimitiveType.WideChar))
+            if (type.IsPrimitiveType(PrimitiveType.Char) ||
+                type.IsPrimitiveType(PrimitiveType.WideChar))
             {
                 Context.Return.Write("Marshal.StringToHGlobalAnsi({0})",
                     Context.Parameter.Name);
@@ -292,7 +293,7 @@ namespace CppSharp.Generators.CSharp
             }
 
             Class @class;
-            if (pointee.Desugar().IsTagDecl(out @class) && @class.IsValueType)
+            if (type.IsTagDecl(out @class) && @class.IsValueType)
             {
                 if (Context.Parameter.Usage == ParameterUsage.Out)
                 {
@@ -312,7 +313,7 @@ namespace CppSharp.Generators.CSharp
             }
 
             PrimitiveType primitive;
-            if (pointee.IsPrimitiveType(out primitive))
+            if (type.IsPrimitiveType(out primitive))
             {
                 Context.Return.Write(Context.Parameter.Name);
                 return true;

src/Generator/Parser.cs

@@ -52,7 +52,8 @@ namespace CppSharp
                 NoBuiltinIncludes = options.NoBuiltinIncludes,
                 MicrosoftMode = options.MicrosoftMode,
                 ToolSetToUse = options.ToolsetToUse,
-                TargetTriple = options.TargetTriple
+                TargetTriple = options.TargetTriple,
+                Abi = options.Abi
             };
 
             var result = ClangParser.ParseHeader(parserOptions);

src/Parser/Parser.cpp

@@ -114,7 +114,7 @@ void Parser::SetupHeader()
     C->setInvocation(Inv);
 
     TargetOptions& TO = Inv->getTargetOpts();
-    TargetABI = Opts->MicrosoftMode ? TargetCXXABI::Microsoft
+    TargetABI = (Opts->Abi == CppSharp::AST::CppAbi::Microsoft) ? TargetCXXABI::Microsoft
         : TargetCXXABI::GenericItanium;
     TO.CXXABI = GetCXXABIString(TargetABI);
 

src/Parser/Parser.h

@@ -66,6 +66,7 @@ public ref struct ParserOptions
     bool NoStandardIncludes;
     bool NoBuiltinIncludes;
     bool MicrosoftMode;
+	CppSharp::AST::CppAbi Abi;
 
     bool Verbose;
 };