Skip to content

Commit 6a1a862

Browse files
committed
Merge pull request #110324 from van800/shakhov/platform_toolset
Improve the CPP dialect selection for Rider, when MSVC is not used
2 parents d1a9010 + 7be003f commit 6a1a862

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

misc/msvs/nmake.substitution.props

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<!-- override the PlatformToolset, which is set in the godot.vcxproj-->
5-
<!-- Unknown matches to a set of conservative rules for the code analysis-->
6-
<PlatformToolset>Unknown</PlatformToolset>
74
<LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
5+
6+
<!-- Possible values: V143, Clang_Mac, Clang_Linux, llvm, Clang, ClangCL, MSFS, Unknown-->
7+
<!-- Select toolset based on target GodotPlatform. Switches Cpp dialect -->
8+
<PlatformToolset Condition="'$(GodotPlatform)'=='windows'">v143</PlatformToolset>
9+
<PlatformToolset Condition="'$(GodotPlatform)'=='macos' or '$(GodotPlatform)'=='ios'">Clang_Mac</PlatformToolset>
10+
<PlatformToolset Condition="'$(GodotPlatform)'=='linux'">Clang_Linux</PlatformToolset>
11+
<PlatformToolset Condition="'$(GodotPlatform)'=='android'">Clang_Linux</PlatformToolset>
12+
<PlatformToolset Condition="'$(GodotPlatform)'=='web'">Clang_Linux</PlatformToolset>
13+
<!-- Fallback -->
14+
<PlatformToolset Condition="'$(PlatformToolset)'==''">Unknown</PlatformToolset>
15+
816
</PropertyGroup>
917
<!-- Build/Rebuild/Clean targets for NMake are defined in MSVC, so we need to provide them, when using MSBuild without MSVC targets -->
1018
<Target Name="Build">

0 commit comments

Comments
 (0)