proper import of nmake.substitution.props

godotengine · Mar 5, 2025 · 20fb9c8 · 20fb9c8
1 parent 0b6c576
commit 20fb9c8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/misc/msvs/nmake.substitution.props b/misc/msvs/nmake.substitution.props
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- NMake is Windows only, so we need to wrap everything useful for non-windows msbuild -->
+  <PropertyGroup>
+    <LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
+    <DefaultPlatformToolset>$(PlatformToolset)</DefaultPlatformToolset>
+  </PropertyGroup>
+
+  <Target Name="Build">
+    <Exec Command="$(NMakeBuildCommandLine)"/>
+  </Target>
+  <Target Name="Rebuild">
+    <Exec Command="$(NMakeReBuildCommandLine)"/>
+  </Target>
+  <Target Name="Clean">
+    <Exec Command="$(NMakeCleanCommandLine)"/>
+  </Target>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>
+        $(NMakePreprocessorDefinitions)
+      </PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/misc/msvs/props.template b/misc/msvs/props.template
@@ -11,38 +11,17 @@
     <NMakeAssemblySearchPath>$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
     <NMakeForcedUsingAssemblies>$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <AdditionalOptions>%%OPTIONS%% $(AdditionalOptions)</AdditionalOptions>
-
     <PlatformToolset>%%PlatformToolset%%</PlatformToolset>
-    <!-- NMake is Windows only, so we need to wrap everything useful for non-windows msbuild -->
-      <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
-        <LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
-        <DefaultPlatformToolset>$(PlatformToolset)</DefaultPlatformToolset>
-      </PropertyGroup>
-
-      <Target Name="Build" Condition="'$(OS)' != 'Windows_NT'">
-        <Exec Command="$(NMakeBuildCommandLine)"/>
-      </Target>
-      <Target Name="Rebuild" Condition="'$(OS)' != 'Windows_NT'">
-        <Exec Command="$(NMakeReBuildCommandLine)"/>
-      </Target>
-      <Target Name="Clean" Condition="'$(OS)' != 'Windows_NT'">
-        <Exec Command="$(NMakeCleanCommandLine)"/>
-      </Target>
-
-      <ItemDefinitionGroup Condition="'$(OS)' != 'Windows_NT'">
-        <ClCompile>
-          <PreprocessorDefinitions>
-            $(NMakePreprocessorDefinitions)
-          </PreprocessorDefinitions>
-        </ClCompile>
-      </ItemDefinitionGroup>
   </PropertyGroup>
   <PropertyGroup Condition="%%CONDITION%%">
     %%PROPERTIES%%
   </PropertyGroup>
   <ItemGroup Condition="%%CONDITION%%">
     %%EXTRA_ITEMS%%
   </ItemGroup>
+
+  <!-- NMake is Windows only, so we need to wrap everything useful for non-windows msbuild -->
+  <Import Project="$(MSBuildProjectDirectory)/misc/msvs/nmake.substitution.props" Condition="'$(GodotConfiguration)|$(GodotPlatform)'=='%%VSCONF%%' And '$(OS)' != 'Windows_NT'" />
 </Project>
 <!-- CHECKSUM
 %%HASH%%