diff options
| author | Larry Hastings <larry@hastings.org> | 2015-09-09 07:00:54 -0700 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-09-09 07:00:54 -0700 |
| commit | fa3052293c0120b54d972b5d41a13eaf43946b09 (patch) | |
| tree | 15cec2915e73b86d4e36391b2938e1edfad4c873 /PCbuild | |
| parent | 69d17b8026eb7b747dfc1c9a1677a0853470b2b1 (diff) | |
| parent | 7577a73790da92ade16ff6611489727377090da7 (diff) | |
| download | cpython-fa3052293c0120b54d972b5d41a13eaf43946b09.tar.gz | |
Merge from 3.5.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.props | 8 | ||||
| -rw-r--r-- | PCbuild/tcl.vcxproj | 4 | ||||
| -rw-r--r-- | PCbuild/tix.vcxproj | 4 | ||||
| -rw-r--r-- | PCbuild/tk.vcxproj | 4 |
4 files changed, 9 insertions, 11 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> diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj index e9287c7b37..464c83ce80 100644 --- a/PCbuild/tcl.vcxproj +++ b/PCbuild/tcl.vcxproj @@ -61,8 +61,8 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <PropertyGroup> - <TclOpts>ucrt</TclOpts> - <TclOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TclOpts> + <TclOpts>msvcrt</TclOpts> + <TclOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TclOpts> <TclDirs>INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs> <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags> <NMakeBuildCommandLine>setlocal diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index a1dad1e301..f857f9e67f 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -57,8 +57,8 @@ <PropertyGroup> <TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs> - <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=g TK_DBGX=g</DebugFlags> - <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1 UCRT=1</DebugFlags> + <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g</DebugFlags> + <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1</DebugFlags> <NMakeBuildCommandLine>setlocal @(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' ') diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj index 589338cf5c..20749f719f 100644 --- a/PCbuild/tk.vcxproj +++ b/PCbuild/tk.vcxproj @@ -60,8 +60,8 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <PropertyGroup> - <TkOpts>ucrt</TkOpts> - <TkOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TkOpts> + <TkOpts>msvcrt</TkOpts> + <TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts> <TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs> <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags> <NMakeBuildCommandLine>setlocal |