From df622f1f0bca30ddd368d69c0b0b5021ddef9c70 Mon Sep 17 00:00:00 2001
From: Ivan Shakhov <ivan.shakhov@jetbrains.com>
Date: Tue, 22 Apr 2025 16:47:38 +0200
Subject: [PATCH] Fixes for Rider on Mac: 1. `size_t` ambigious symbol 2.
 LanguageStandard was not parsed from AdditionalOptions

---
 misc/msvs/nmake.substitution.props | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/misc/msvs/nmake.substitution.props b/misc/msvs/nmake.substitution.props
index 05a155eb9eb..3f94fc4c1e7 100644
--- a/misc/msvs/nmake.substitution.props
+++ b/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>