seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #113251 from van800/master

Browse Source 
Revert "Improve the CPP dialect selection for Rider, when MSVC is not used"
This commit is contained in:
Rémi Verschelde
2025-11-27 23:00:46 +01:00
committed by GitHub
parent a2db180527 8c93de89d1
commit 7ed0b61676
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
misc/msvs/nmake.substitution.props
View File

@ -1,18 +1,10 @@
<?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>
<LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
<!-- Possible values: V143, Clang_Mac, Clang_Linux, llvm, Clang, ClangCL, MSFS, Unknown-->
<!-- Select toolset based on target GodotPlatform. Switches Cpp dialect -->
<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 -->
<PlatformToolset Condition="'$(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">