Browse Source

Merge pull request #105650 from van800/size_t_red_code_fix

Fixes for `.sln` project generation for Rider on Mac/Linux
Thaddeus Crews 3 months ago
parent
commit
6b8a0f1edd
1 changed files with 19 additions and 0 deletions
  1. 19 0
      misc/msvs/nmake.substitution.props

+ 19 - 0
misc/msvs/nmake.substitution.props

@@ -16,4 +16,23 @@
   <Target Name="Clean">
     <Exec Command="$(NMakeCleanCommandLine)"/>
   </Target>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(AdditionalOptions)</AdditionalOptions>
+      <ForcedIncludeFiles>$(NMakeForcedIncludes)</ForcedIncludeFiles>
+      <ForcedUsingFiles>$(NMakeForcedUsingAssemblies)</ForcedUsingFiles>
+      <PreprocessorDefinitions>$(NMakePreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <!-- check get_platforms in each msvs.py for possible value of those conditions -->
+    <!-- MSVC Platform.Common.props for possible TargetMachine values -->
+    <Link Condition="'$(Platform)' == 'arm64'">
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+    <Link Condition="'$(Platform)' == 'x64'">
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <Link Condition="'$(Platform)' == 'Win32'">
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
 </Project>