Commit 2ad6469c authored by evoskuil's avatar evoskuil

Modify MSVC link incremental setting for deconfliction with LTCG flag.

parent 2e802a46
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<!-- RootNamespace is used to deconflict output files from differing project versions. --> <!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir> <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir> <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<ClCompile> <ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. --> <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
......
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<!-- This overrides Debug.props->LinkIncremental and therefore this reference must always be set after Debug.props is included. -->
<LinkIncremental>false</LinkIncremental>
</ClCompile> </ClCompile>
<Link> <Link>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<ClCompile> <ClCompile>
<!-- Linking CRT statically when building a static library is conventional. --> <!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<ClCompile> <ClCompile>
<!-- Linking CRT statically when building a static library is conventional. --> <!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>false</LinkIncremental>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment