diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-03-22 03:58:19 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-03-22 03:58:19 (GMT) |
| commit | a191b91a4373937e7545b92d875160a5f66a2f3e (patch) | |
| tree | bb510e5b0885a8823deb00b4c5362b597eb74233 /PCbuild/pyproject.props | |
| parent | 04ea84a20da667e39790827b978b21732753bd91 (diff) | |
| download | cpython-a191b91a4373937e7545b92d875160a5f66a2f3e.zip cpython-a191b91a4373937e7545b92d875160a5f66a2f3e.tar.gz cpython-a191b91a4373937e7545b92d875160a5f66a2f3e.tar.bz2 | |
Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows build
solution.
Currently, Tix is not built in Debug configuration.
This change also:
- simplifies some Tcl/Tk-related msbuild properties for _tkinter
- copies the Tcl and Tk DLLs into the build output directory, meaning
they will always be available after a build without having to copy
them manually or change PATH
- removes PCbuild/build_tkinter.py: the solution does the build without
needing to invoke Python (so Tcl/Tk/Tix can be built in parallel with
the rest of the build using the `/m` msbuild command line switch)
- removes an outdated README concerning building Tcl/Tk on AMD64
Diffstat (limited to 'PCbuild/pyproject.props')
| -rw-r--r-- | PCbuild/pyproject.props | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index f28370f..6e5e6be 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -21,12 +21,10 @@ <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir> + <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir> + <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir> + <tixDir>$(externalsDir)\tix-8.4.3.3</tixDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> - <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> - <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> @@ -82,23 +80,17 @@ <BuildMacro Include="opensslDir"> <Value>$(opensslDir)</Value> </BuildMacro> - <BuildMacro Include="tcltkDir"> - <Value>$(tcltkDir)</Value> - </BuildMacro> - <BuildMacro Include="tcltk64Dir"> - <Value>$(tcltk64Dir)</Value> + <BuildMacro Include="tclDir"> + <Value>$(tclDir)</Value> </BuildMacro> - <BuildMacro Include="tcltkLib"> - <Value>$(tcltkLib)</Value> + <BuildMacro Include="tkDir"> + <Value>$(tkDir)</Value> </BuildMacro> - <BuildMacro Include="tcltkLibDebug"> - <Value>$(tcltkLibDebug)</Value> + <BuildMacro Include="tixDir"> + <Value>$(tixDir)</Value> </BuildMacro> - <BuildMacro Include="tcltk64Lib"> - <Value>$(tcltk64Lib)</Value> - </BuildMacro> - <BuildMacro Include="tcltk64LibDebug"> - <Value>$(tcltk64LibDebug)</Value> + <BuildMacro Include="tcltkDir"> + <Value>$(tcltkDir)</Value> </BuildMacro> </ItemGroup> -</Project> +</Project>
\ No newline at end of file |