diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-08-18 23:01:25 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-08-18 23:01:25 (GMT) |
| commit | 572183cce304a8d6be096852f7f999658889ae0d (patch) | |
| tree | 47b281383ec448f11e83729a5535685e546803e1 /PCbuild | |
| parent | ea623b9573dff1c951e785cc2eacbf8e0edb3fe9 (diff) | |
| parent | 9f0cbbc3769c716affc630102800f43ee64b3524 (diff) | |
| download | cpython-572183cce304a8d6be096852f7f999658889ae0d.zip cpython-572183cce304a8d6be096852f7f999658889ae0d.tar.gz cpython-572183cce304a8d6be096852f7f999658889ae0d.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 6 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/tcl.vcxproj | 3 | ||||
| -rw-r--r-- | PCbuild/tcltk.props | 4 | ||||
| -rw-r--r-- | PCbuild/tix.vcxproj | 6 | ||||
| -rw-r--r-- | PCbuild/tk.vcxproj | 4 |
6 files changed, 12 insertions, 13 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 3037326..a015af5 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,9 +55,9 @@ for %%e in ( bzip2-1.0.6
nasm-2.11.06
openssl-1.0.2d
- tcl-core-8.6.4.1
- tk-8.6.4.1
- tix-8.4.3.4
+ tcl-core-8.6.4.2
+ tk-8.6.4.2
+ tix-8.4.3.5
sqlite-3.8.11.0
xz-5.0.5
) do (
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 9d5f342..68cdb0f 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -236,7 +236,7 @@ _sqlite3 Homepage:
http://www.sqlite.org/
_tkinter
- Wraps version 8.6.1 of the Tk windowing system.
+ Wraps version 8.6.4 of the Tk windowing system.
Homepage:
http://www.tcl.tk/
diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj index 8f2544a..e9287c7 100644 --- a/PCbuild/tcl.vcxproj +++ b/PCbuild/tcl.vcxproj @@ -61,7 +61,8 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <PropertyGroup> - <TclOpts Condition="$(Configuration) == 'Debug'">symbols</TclOpts> + <TclOpts>ucrt</TclOpts> + <TclOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</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/tcltk.props b/PCbuild/tcltk.props index 96bd577..6d28338 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -5,7 +5,7 @@ <TclMajorVersion>8</TclMajorVersion> <TclMinorVersion>6</TclMinorVersion> <TclPatchLevel>4</TclPatchLevel> - <TclRevision>1</TclRevision> + <TclRevision>2</TclRevision> <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion> <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion> <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel> @@ -13,7 +13,7 @@ <TixMajorVersion>8</TixMajorVersion> <TixMinorVersion>4</TixMinorVersion> <TixPatchLevel>3</TixPatchLevel> - <TixRevision>4</TixRevision> + <TixRevision>5</TixRevision> <tclDir>$(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\</tclDir> <tkDir>$(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\</tkDir> <tixDir>$(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\</tixDir> diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index 74a6b84..1786324 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -56,11 +56,9 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <PropertyGroup> - <TkOpts>msvcrt</TkOpts> - <TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts> <TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs> - <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 TCL_DBGX=g DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags> - <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1</DebugFlags> + <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=tg TK_DBGX=tg</DebugFlags> + <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1 UCRT=1 TCL_DBGX=t TK_DBGX=t</DebugFlags> <NMakeBuildCommandLine>setlocal @(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' ') diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj index 20749f7..589338c 100644 --- a/PCbuild/tk.vcxproj +++ b/PCbuild/tk.vcxproj @@ -60,8 +60,8 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <PropertyGroup> - <TkOpts>msvcrt</TkOpts> - <TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts> + <TkOpts>ucrt</TkOpts> + <TkOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TkOpts> <TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs> <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags> <NMakeBuildCommandLine>setlocal |