diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2013-11-23 22:05:27 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2013-11-23 22:05:27 (GMT) |
| commit | 8d0d369067462080f5ea9d50416a12bee0ef3a6a (patch) | |
| tree | 4bf748526445fdadbc29c0ca78d71e661098b256 /PCbuild | |
| parent | 67986f94311ffb46fe5b3efce74d749029041b73 (diff) | |
| download | cpython-8d0d369067462080f5ea9d50416a12bee0ef3a6a.zip cpython-8d0d369067462080f5ea9d50416a12bee0ef3a6a.tar.gz cpython-8d0d369067462080f5ea9d50416a12bee0ef3a6a.tar.bz2 | |
Update Tcl/Tk to 8.6.1.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build_tkinter.py | 6 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 8 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/PCbuild/build_tkinter.py b/PCbuild/build_tkinter.py index 9f08631..c807e7b 100644 --- a/PCbuild/build_tkinter.py +++ b/PCbuild/build_tkinter.py @@ -11,9 +11,9 @@ import sys here = os.path.abspath(os.path.dirname(__file__)) par = os.path.pardir -TCL = "tcl8.5.11" -TK = "tk8.5.11" -TIX = "tix-8.4.3.x" +TCL = "tcl8.6.1" +TK = "tk8.6.1" +TIX = "tix-8.4.3.3" ROOT = os.path.abspath(os.path.join(here, par, par)) NMAKE = ('nmake /nologo /f %s %s %s') diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index c78a523..7b65961 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -23,10 +23,10 @@ <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> - <tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib> - <tcltkLibDebug>$(tcltkDir)\lib\tcl85g.lib;$(tcltkDir)\lib\tk85g.lib</tcltkLibDebug> - <tcltk64Lib>$(tcltk64Dir)\lib\tcl85.lib;$(tcltk64Dir)\lib\tk85.lib</tcltk64Lib> - <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib</tcltk64LibDebug> + <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> + <tcltkLibDebug>$(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib</tcltkLibDebug> + <tcltk64Lib>$(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib</tcltk64Lib> + <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib</tcltk64LibDebug> </PropertyGroup> <ItemDefinitionGroup> <ClCompile> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index de8e93c..3263570 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -211,7 +211,7 @@ _sqlite3 Homepage: http://www.sqlite.org/ _tkinter - Wraps version 8.5.11 of the Tk windowing system. + Wraps version 8.6.1 of the Tk windowing system. Homepage: http://www.tcl.tk/ @@ -261,7 +261,7 @@ The external-amd64.bat file contains this for tcl: So for a release build, you'd call it as: nmake -f makefile.vc MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install -Note that the above command is called from within ..\..\tcl-8.5.11.0\win +Note that the above command is called from within ..\..\tcl-8.6.1.0\win (relative to this directory); don't forget to build Tk as well as Tcl! This will be cleaned up in the future; http://bugs.python.org/issue15968 |