summaryrefslogtreecommitdiff
path: root/PCbuild/pyproject.props
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-09-08 21:39:01 -0700
committerSteve Dower <steve.dower@microsoft.com>2015-09-08 21:39:01 -0700
commitfcbe1df4afe10eed49e97bf08ba748f9140a5bf3 (patch)
tree24df31883a5d686b9536fa7ad0db07616d2c7aa1 /PCbuild/pyproject.props
parent0130e2991d901d43237d21df47c2adc8222233ba (diff)
downloadcpython-git-fcbe1df4afe10eed49e97bf08ba748f9140a5bf3.tar.gz
Issue #25027: Reverts partial-static build options and adds vcruntime140.dll to Windows installation.
Diffstat (limited to 'PCbuild/pyproject.props')
-rw-r--r--PCbuild/pyproject.props8
1 files changed, 3 insertions, 5 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index f63c30dd13..c1303e1aac 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -36,7 +36,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<ExceptionHandling></ExceptionHandling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -47,7 +47,7 @@
<ClCompile Condition="$(Configuration) == 'Debug'">
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -57,9 +57,7 @@
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<DataExecutionPrevention>true</DataExecutionPrevention>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalDependencies Condition="$(Configuration) == 'Debug'">ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalDependencies Condition="$(Configuration) != 'Debug'">ucrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreSpecificDefaultLibraries>LIBC;libucrt.lib;libucrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<TargetMachine>MachineX86</TargetMachine>
<TargetMachine Condition="'$(Platform)' == 'x64'">MachineX64</TargetMachine>
<ProfileGuidedDatabase Condition="$(SupportPGO)">$(OutDir)$(TargetName).pgd</ProfileGuidedDatabase>