++

van800 · Mar 5, 2025 · f12772a · f12772a
1 parent a4ad06d
commit f12772a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/misc/msvs/props.template b/misc/msvs/props.template
@@ -19,23 +19,27 @@
     %%EXTRA_ITEMS%%
   </ItemGroup>
 
-  <!-- Required for Rider below this line-->
-  <PropertyGroup Condition=" '$(PlatformToolset)' == 'Clang' ">
+  <!-- We are using MSBuild w/o MSVC toolset, (Rider can do that) -->
+  <PropertyGroup>
+    <DefaultPlatformToolset>$(PlatformToolset)</DefaultPlatformToolset>
+    <NoMSVCProps Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') ">True</NoMSVCProps>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(NoMSVCDefaultProps)'=='True'">
     <LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
     <DefaultPlatformToolset>$(PlatformToolset)</DefaultPlatformToolset>
   </PropertyGroup>
 
-  <Target Name="Build" Condition=" '$(PlatformToolset)' == 'Clang' ">
+  <Target Name="Build" Condition="'$(NoMSVCDefaultProps)'=='True'">
     <Exec Command="$(NMakeBuildCommandLine)"/>
   </Target>
-  <Target Name="Rebuild" Condition=" '$(PlatformToolset)' == 'Clang' ">
+  <Target Name="Rebuild" Condition="'$(NoMSVCDefaultProps)'=='True'">
     <Exec Command="$(NMakeReBuildCommandLine)"/>
   </Target>
-  <Target Name="Clean" Condition=" '$(PlatformToolset)' == 'Clang' ">
+  <Target Name="Clean" Condition="'$(NoMSVCDefaultProps)'=='True'">
     <Exec Command="$(NMakeCleanCommandLine)"/>
   </Target>
 
-  <ItemDefinitionGroup Condition=" '$(PlatformToolset)' == 'Clang' ">
+  <ItemDefinitionGroup Condition="'$(NoMSVCDefaultProps)'=='True'">
     <ClCompile>
       <PreprocessorDefinitions>
         $(NMakePreprocessorDefinitions)

diff --git a/misc/msvs/vcxproj.template b/misc/msvs/vcxproj.template
@@ -10,7 +10,7 @@
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   %%PROPERTIES%%
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -19,7 +19,7 @@
     <IntDir>obj\$(GodotPlatform)\$(GodotConfiguration)\</IntDir>
     <LayoutDir>$(OutDir)\Layout</LayoutDir>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" exists('$(VCTargetsPath)\Microsoft.Cpp.props') "/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -34,7 +34,7 @@
   <ItemGroup Condition="'$(IncludeListImported)'==''">
     %%DEFAULT_ITEMS%%
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" exists('$(VCTargetsPath)\Microsoft.Cpp.targets') "/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>