Skip to content

Commit 6b8a0f1

Browse files
committed
Merge pull request #105650 from van800/size_t_red_code_fix
Fixes for `.sln` project generation for Rider on Mac/Linux
2 parents 19b9c03 + df622f1 commit 6b8a0f1

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

misc/msvs/nmake.substitution.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,23 @@
1616
<Target Name="Clean">
1717
<Exec Command="$(NMakeCleanCommandLine)"/>
1818
</Target>
19+
<ItemDefinitionGroup>
20+
<ClCompile>
21+
<AdditionalOptions>$(AdditionalOptions)</AdditionalOptions>
22+
<ForcedIncludeFiles>$(NMakeForcedIncludes)</ForcedIncludeFiles>
23+
<ForcedUsingFiles>$(NMakeForcedUsingAssemblies)</ForcedUsingFiles>
24+
<PreprocessorDefinitions>$(NMakePreprocessorDefinitions)</PreprocessorDefinitions>
25+
</ClCompile>
26+
<!-- check get_platforms in each msvs.py for possible value of those conditions -->
27+
<!-- MSVC Platform.Common.props for possible TargetMachine values -->
28+
<Link Condition="'$(Platform)' == 'arm64'">
29+
<TargetMachine>MachineARM64</TargetMachine>
30+
</Link>
31+
<Link Condition="'$(Platform)' == 'x64'">
32+
<TargetMachine>MachineX64</TargetMachine>
33+
</Link>
34+
<Link Condition="'$(Platform)' == 'Win32'">
35+
<TargetMachine>MachineX86</TargetMachine>
36+
</Link>
37+
</ItemDefinitionGroup>
1938
</Project>

0 commit comments

Comments
 (0)