Skip to content

Commit 67a75fb

Browse files
authored
Merge branch 'main' into pkacha/PSX-fix-iswspace
2 parents b0784ae + fa35b7a commit 67a75fb

3 files changed

Lines changed: 193 additions & 182 deletions

File tree

Build/libHttpClient.GDK/libHttpClient.GDK.vcxproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@
1818
<None Include="libHttpClient.GDK.def" />
1919
</ItemGroup>
2020
<Import Project="$([MSBuild]::GetPathOfFileAbove(libHttpClient.GDK.props))" />
21+
<!-- Separate IntDir/OutDir when building without suffix to avoid conflicts with the default suffixed build -->
22+
<PropertyGroup Condition="'$(LibHttpClientIncludeSuffix)' == 'false'">
23+
<IntDir>$(HCIntRoot)\$(Platform)\$(Configuration)\$(MSBuildProjectName).nosuffix\</IntDir>
24+
<OutDir>$(HCOutRoot)\$(Platform)\$(Configuration)\$(MSBuildProjectName).nosuffix\</OutDir>
25+
</PropertyGroup>
26+
<ItemDefinitionGroup>
27+
<ClCompile>
28+
<!-- Allow concurrent PDB writes when solution and ProjectReference builds overlap -->
29+
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
30+
</ClCompile>
31+
</ItemDefinitionGroup>
2132
<ItemDefinitionGroup>
2233
<Link>
2334
<ModuleDefinitionFile>$(HCBuildRoot)\$(ProjectName)\$(ProjectName).def</ModuleDefinitionFile>

0 commit comments

Comments
 (0)