summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-04-04 08:24:56 (GMT)
committer evoskuil <eric@voskuil.org>2014-04-04 08:24:56 (GMT)
commit7be3b48871d5e0a487fc054594e60ce524091de8 (patch)
tree2393e6bbded3c24b89842cc08f27c230f325ec7b
parent6f143c62800dd8f6cbfa1d12ec721e2a780fbff4 (diff)
Update Visual Studio standard project props.
-rw-r--r--builds/msvc/vs2013/properties/Common.props2
-rw-r--r--builds/msvc/vs2013/properties/Debug.props1
-rw-r--r--builds/msvc/vs2013/properties/DynamicDebug.props1
-rw-r--r--builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props3
-rw-r--r--builds/msvc/vs2013/properties/StaticDebug.props1
-rw-r--r--builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props1
6 files changed, 4 insertions, 5 deletions
diff --git a/builds/msvc/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props
index 10e0380..79b0b6c 100644
--- a/builds/msvc/vs2013/properties/Common.props
+++ b/builds/msvc/vs2013/properties/Common.props
@@ -11,7 +11,7 @@
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
- <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is UCS-16. -->
+ <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
<PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
diff --git a/builds/msvc/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props
index 825321a..7f060f4 100644
--- a/builds/msvc/vs2013/properties/Debug.props
+++ b/builds/msvc/vs2013/properties/Debug.props
@@ -7,7 +7,6 @@
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
- <LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props
index 81befdc..0395433 100644
--- a/builds/msvc/vs2013/properties/DynamicDebug.props
+++ b/builds/msvc/vs2013/properties/DynamicDebug.props
@@ -15,6 +15,7 @@
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
index 42708b5..338a970 100644
--- a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
+++ b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
@@ -9,9 +9,6 @@
<ItemDefinitionGroup>
<ClCompile>
<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>
<Link>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props
index f0693f1..b5e5ba9 100644
--- a/builds/msvc/vs2013/properties/StaticDebug.props
+++ b/builds/msvc/vs2013/properties/StaticDebug.props
@@ -15,6 +15,7 @@
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
index 18b017c..ae5f350 100644
--- a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
+++ b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
@@ -15,6 +15,7 @@
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <LinkIncremental>false</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>