choose appropriate PlatformToolset based on the GodotPlatform

Author: van800

.sln/gdext.vcxproj

@@ -90,7 +90,16 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v143</PlatformToolset> <!--Makes Visual Studio happy. Might be overridden in the platform specific import or godot.user.props -->
+    <!-- Possible values: V143, Clang_Mac, Clang_Linux, llvm, Clang, ClangCL, MSFS, Unknown-->
+    <!-- Select toolset based on target GodotPlatform. Switches Cpp dialect a bit -->
+    <PlatformToolset Condition="'$(GodotPlatform)'=='windows'">v143</PlatformToolset>
+    <PlatformToolset Condition="'$(GodotPlatform)'=='macos' or '$(GodotPlatform)'=='ios'">Clang_Mac</PlatformToolset>
+    <PlatformToolset Condition="'$(GodotPlatform)'=='linux'">Clang_Linux</PlatformToolset>
+    <PlatformToolset Condition="'$(GodotPlatform)'=='android'">Clang_Linux</PlatformToolset>
+    <PlatformToolset Condition="'$(GodotPlatform)'=='web'">Clang_Linux</PlatformToolset>
+    <!-- Fallback when platform is not matched -->
+    <PlatformToolset Condition="'$(PlatformToolset)'==''">Unknown</PlatformToolset>
+
     <NMakeWorkingDirectory>$(RepoRoot)</NMakeWorkingDirectory>
     <NMakeOutput Condition="'$(NMakeOutput)' == ''">dylib</NMakeOutput> <!--any non empty value required for automatic run configuration generation in Rider -->
     <LocalDebuggerWorkingDirectory Condition="'$(LocalDebuggerWorkingDirectory)' == ''">$(NMakeWorkingDirectory)/demo</LocalDebuggerWorkingDirectory>

.sln/targets/nmake.substitution.props

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-      <!-- override the PlatformToolset, which is set in the godot.vcxproj-->
-      <!-- Unknown matches to a set of conservative rules for the code analysis-->
-    <PlatformToolset>Unknown</PlatformToolset>
-  </PropertyGroup>
   <!-- Build/Rebuild/Clean targets for NMake are defined in MSVC, so we need to provide them, when using MSBuild without MSVC targets -->
   <Target Name="Build">
     <Exec Command="$(NMakeBuildCommandLine)"
@@ -19,12 +14,6 @@
           WorkingDirectory="$(NMakeWorkingDirectory)"/>
   </Target>
   <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>$(AdditionalOptions)</AdditionalOptions>
-      <ForcedIncludeFiles>$(NMakeForcedIncludes)</ForcedIncludeFiles>
-      <ForcedUsingFiles>$(NMakeForcedUsingAssemblies)</ForcedUsingFiles>
-      <PreprocessorDefinitions>$(NMakePreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <!-- Reflects what Platform.Common.props does. -->
     <Link Condition="'$(Arch)' == 'arm64'">
       <TargetMachine>MachineARM64</TargetMachine>