Migrated to the target used by Qt as opposed to a hard-coded one.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

CppSharp Qt plan.odt

@@ -22,8 +22,8 @@ public static int Main(string[] args)
                 Console.WriteLine("The specified qmake does not exist.");
                 return -1;
             }
-            string makePath = args[1];
-            if (!File.Exists(makePath))
+            string make = args[1];
+            if (!File.Exists(make))
             {
                 Console.WriteLine("The specified make does not exist.");
                 return -1;
@@ -59,12 +59,18 @@ public static int Main(string[] args)
                 return -1;
             }
             string docs = ProcessHelper.Run(qmake, "-query QT_INSTALL_DOCS", out error);
+            string output = ProcessHelper.Run(Path.Combine(Path.GetDirectoryName(make), "gcc"), "-v", out error);
+            if (string.IsNullOrEmpty(output))
+            {
+                output = error;
+            }
+            string target = Regex.Match(output, @"Target:\s*(?<target>[^\r\n]+)").Groups["target"].Value;
+            string compilerVersion = Regex.Match(output, @"gcc\s+version\s+(?<version>\S+)").Groups["version"].Value;
             foreach (string libFile in libFiles)
             {
                 if (libFile == "libQt5Core.a")
                 {
-                    string module = Regex.Match(libFile, @"Qt\d?(?<module>\w+)\.\w+$").Groups["module"].Value;
-                    ConsoleDriver.Run(new QtSharp(qmake, makePath, headers, module, libs, libFile, docs));
+                    ConsoleDriver.Run(new QtSharp(qmake, make, headers, libs, libFile, target, compilerVersion, docs));
                 }
             }
             return 0;

QtSharp.CLI/Program.cs

@@ -1,6 +1,8 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using CppSharp;
 using CppSharp.AST;
 using CppSharp.Generators;
@@ -17,24 +19,28 @@ public class QtSharp : ILibrary
 	    private readonly string module;
 	    private readonly string libraryPath;
 	    private readonly string library;
+	    private readonly string target;
+	    private readonly string compilerVersion;
 	    private readonly string docs;
 
-	    public QtSharp(string qmake, string make, string includePath, string module, string libraryPath, string library, string docs)
+	    public QtSharp(string qmake, string make, string includePath, string libraryPath, string library, string target, string compilerVersion, string docs)
 	    {
 	        this.qmake = qmake;
 	        this.includePath = includePath;
-	        this.module = module;
+	        this.module = Regex.Match(library, @"Qt\d?(?<module>\w+)\.\w+$").Groups["module"].Value;
 	        this.libraryPath = libraryPath;
 	        this.library = library;
-            this.make = make;
+	        this.target = target;
+	        this.compilerVersion = compilerVersion;
+	        this.make = make;
             this.docs = docs;
 	    }
 
 	    public void Preprocess(Driver driver, ASTContext lib)
 	    {
             string qtModule = "Qt" + this.module;
 	        string moduleIncludes = Path.Combine(this.includePath, qtModule);
-	        foreach (TranslationUnit unit in lib.TranslationUnits)
+	        foreach (TranslationUnit unit in lib.TranslationUnits.Where(u => u.FilePath != "<invalid>"))
 	        {
 	            if (Path.GetDirectoryName(unit.FilePath) != moduleIncludes)
 	            {
@@ -147,6 +153,9 @@ public void Setup(Driver driver)
 			driver.Options.GeneratorKind = GeneratorKind.CSharp;
 		    string qtModule = "Qt" + this.module;
 		    driver.Options.Is32Bit = true;
+		    driver.Options.NoBuiltinIncludes = true;
+		    driver.Options.MicrosoftMode = false;
+            driver.Options.TargetTriple = this.target;
             driver.Options.Abi = CppAbi.Itanium;
 		    driver.Options.LibraryName = string.Format("{0}Sharp", qtModule);
 		    driver.Options.OutputNamespace = qtModule;
@@ -158,11 +167,15 @@ public void Setup(Driver driver)
 			driver.Options.IgnoreParseWarnings = true;
 		    driver.Options.CheckSymbols = true;
             driver.Options.Headers.Add(qtModule);
-			driver.Options.IncludeDirs.Add(this.includePath);
+		    string gccPath = Path.GetDirectoryName(Path.GetDirectoryName(this.make));
+            driver.Options.IncludeDirs.Add(Path.Combine(gccPath, this.target, "include"));
+            driver.Options.IncludeDirs.Add(Path.Combine(gccPath, "lib", "gcc", this.target, this.compilerVersion, "include"));
+            driver.Options.IncludeDirs.Add(Path.Combine(gccPath, "lib", "gcc", this.target, this.compilerVersion, "include", "c++"));
+            driver.Options.IncludeDirs.Add(Path.Combine(gccPath, "lib", "gcc", this.target, this.compilerVersion, "include", "c++", this.target));
+            driver.Options.IncludeDirs.Add(this.includePath);
             driver.Options.IncludeDirs.Add(Path.Combine(this.includePath, qtModule));
             driver.Options.LibraryDirs.Add(this.libraryPath);
             driver.Options.Libraries.Add(this.library);
-			driver.Options.Defines.Add("_MSC_FULL_VER=170050215");
 		    if (this.module == "Core")
 		    {
                 string dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);