From c8a70ffda679b37dcfb255094b59cb6282ed3ad7 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 17 Feb 2021 15:58:52 +0100
Subject: [PATCH] Add passing compiler to the build commands from generated
 projects

---
 .../Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs    | 2 ++
 .../VisualStudioCode/VisualStudioCodeProjectGenerator.cs      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
index 4b7f49712..7a254b98e 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
@@ -158,6 +158,8 @@ namespace Flax.Build.Projects.VisualStudio
                                             configuration.Configuration,
                                             configuration.Platform,
                                             target.Name);
+                if (!string.IsNullOrEmpty(Configuration.Compiler))
+                    cmdLine += " -compiler=" + Configuration.Compiler;
 
                 vcProjectFileContent.AppendLine(string.Format("  <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='{0}'\">", configuration.Name));
                 if (platform is IVisualStudioProjectCustomizer customizer)
diff --git a/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
index 126f1027d..e145c050e 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
@@ -198,6 +198,8 @@ namespace Flax.Build.Projects.VisualStudioCode
                                             json.AddUnnamedField(string.Format("-configuration={0}", configuration.ConfigurationName));
                                             json.AddUnnamedField(string.Format("-platform={0}", configuration.PlatformName));
                                             json.AddUnnamedField(string.Format("-buildTargets={0}", target.Name));
+                                            if (!string.IsNullOrEmpty(Configuration.Compiler))
+                                                json.AddUnnamedField(string.Format("-compiler={0}", Configuration.Compiler));
                                         }
                                         json.EndArray();
 
@@ -224,6 +226,8 @@ namespace Flax.Build.Projects.VisualStudioCode
                                             json.AddUnnamedField(string.Format("--configuration={0}", configuration.ConfigurationName));
                                             json.AddUnnamedField(string.Format("--platform={0}", configuration.PlatformName));
                                             json.AddUnnamedField(string.Format("--buildTargets={0}", target.Name));
+                                            if (!string.IsNullOrEmpty(Configuration.Compiler))
+                                                json.AddUnnamedField(string.Format("--compiler={0}", Configuration.Compiler));
                                         }
                                         json.EndArray();