iwyu integration passes now arch parameter for x64 projects on to iwyu

Fixes #43

Author: Wumpf

IncludeToolbox/IncludeWhatYouUse/IWYU.cs

@@ -250,7 +250,35 @@ static public string RunIncludeWhatYouUse(string fullFileName, EnvDTE.Project pr
                 // MSVC specific. See https://clang.llvm.org/docs/UsersManual.html#microsoft-extensions
                 process.StartInfo.Arguments += "-fms-compatibility -fms-extensions -fdelayed-template-parsing ";
                 process.StartInfo.Arguments += $"-fmsc-version={VSUtils.GetMSCVerString()} ";
-
+                // Architecture
+                var targetMachine = VSUtils.VCUtils.GetLinkerSetting_TargetMachine(project, out reasonForFailure);
+                if(!targetMachine.HasValue)
+                    Output.Instance.ErrorMsg("Failed to query for target machine: {0}", reasonForFailure);
+                else
+                {
+                    switch (targetMachine.Value)
+                    {
+                        // Most targets give an error of this form:
+                        // "error: unknown target CPU 'x86'"
+                        // It seems iwyu is only really fine with x86-64
+
+                        /*case VCProjectUtils.Base.TargetMachineType.X86:
+                            process.StartInfo.Arguments += "-march=x86 ";
+                            break;*/
+                        case VCProjectUtils.Base.TargetMachineType.AMD64:
+                            process.StartInfo.Arguments += "-march=x86-64 ";
+                            break;
+                        /*case VCProjectUtils.Base.TargetMachineType.ARM:
+                            process.StartInfo.Arguments += "-march=arm ";
+                            break;
+                        case VCProjectUtils.Base.TargetMachineType.MIPS:
+                            process.StartInfo.Arguments += "-march=mips ";
+                            break;
+                        case VCProjectUtils.Base.TargetMachineType.THUMB:
+                            process.StartInfo.Arguments += "-march=thumb ";
+                            break;*/
+                    }
+                }
 
                 // icwyu options
                 {

VCProject.Base/IVCHelper.cs

@@ -6,6 +6,29 @@
 
 namespace VCProjectUtils.Base
 {
+    // https://msdn.microsoft.com/en-us/library/microsoft.visualstudio.vcprojectengine.machinetypeoption.aspx
+    public enum TargetMachineType
+    {
+        NotSet = 0,
+        X86 = 1,
+        AM33 = 2,
+        ARM = 3,
+        EBC = 4,
+        IA64 = 5,
+        M32R = 6,
+        MIPS = 7,
+        MIPS16 = 8,
+        MIPSFPU = 9,
+        MIPSFPU16 = 10,
+        MIPSR41XX = 11,
+        SH3 = 12,
+        SH3DSP = 13,
+        SH4 = 14,
+        SH5 = 15,
+        THUMB = 16,
+        AMD64 = 17
+    }
+
     public interface IVCHelper
     {
         bool IsVCProject(EnvDTE.Project project);
@@ -21,5 +44,7 @@ public interface IVCHelper
         bool? GetCompilerSetting_ShowIncludes(EnvDTE.Project document, out string reasonForFailure);
 
         string GetCompilerSetting_PreprocessorDefinitions(EnvDTE.Project project, out string reasonForFailure);
+
+        TargetMachineType? GetLinkerSetting_TargetMachine(EnvDTE.Project project, out string reasonForFailure);
     }
 }

VCProject.Base/VCHelper.cs

@@ -1,13 +1,14 @@
 using EnvDTE;
 using Microsoft.VisualStudio.VCProjectEngine;
+using VCProjectUtils.Base;
 
 #if VC14
 namespace VCProjectUtils.VS14
 #elif VC15
 namespace VCProjectUtils.VS15
 #endif
 {
-    public class VCHelper : VCProjectUtils.Base.IVCHelper
+    public class VCHelper : IVCHelper
     {
         public bool IsVCProject(Project project)
         {
@@ -82,6 +83,34 @@ public static VCCLCompilerTool GetCompilerTool(Project project, out string reaso
             return compilerTool;
         }
 
+        public static VCLinkerTool GetLinkerTool(Project project, out string reasonForFailure)
+        {
+            VCProject vcProject = project?.Object as VCProject;
+            if (vcProject == null)
+            {
+                reasonForFailure = "Failed to retrieve VCLinkerTool since project is not a VCProject.";
+                return null;
+            }
+            VCConfiguration activeConfiguration = vcProject.ActiveConfiguration;
+            var tools = activeConfiguration.Tools;
+            VCLinkerTool linkerTool = null;
+            foreach (var tool in activeConfiguration.Tools)
+            {
+                linkerTool = tool as VCLinkerTool;
+                if (linkerTool != null)
+                    break;
+            }
+
+            if (linkerTool == null)
+            {
+                reasonForFailure = "Couldn't file a VCLinkerTool in VC++ Project.";
+                return null;
+            }
+
+            reasonForFailure = "";
+            return linkerTool;
+        }
+
         public bool IsCompilableFile(Document document, out string reasonForFailure)
         {
             return GetVCFileConfigForCompilation(document, out reasonForFailure) != null;
@@ -121,5 +150,14 @@ public string GetCompilerSetting_PreprocessorDefinitions(Project project, out st
             VCCLCompilerTool compilerTool = GetCompilerTool(project, out reasonForFailure);
             return compilerTool?.PreprocessorDefinitions;
         }
+
+        public TargetMachineType? GetLinkerSetting_TargetMachine(EnvDTE.Project project, out string reasonForFailure)
+        {
+            var linkerTool = GetLinkerTool(project, out reasonForFailure);
+            if (linkerTool == null)
+                return null;
+            else
+                return (TargetMachineType)linkerTool.TargetMachine;
+        }
     }
 }