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/x64.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/x64.props')
| -rw-r--r-- | PCbuild/x64.props | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/PCbuild/x64.props b/PCbuild/x64.props index 985c0ef..9e6f5bb 100644 --- a/PCbuild/x64.props +++ b/PCbuild/x64.props @@ -3,6 +3,9 @@ <PropertyGroup Label="UserMacros" Condition="'$(HOST_PYTHON)'!=''"> <PythonExe>$(HOST_PYTHON)</PythonExe> </PropertyGroup> + <PropertyGroup Label="UserMacros"> + <tcltkDir>$(externalsDir)\tcltk64</tcltkDir> + </PropertyGroup> <ItemDefinitionGroup> <ClCompile> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -16,5 +19,8 @@ <BuildMacro Include="PythonExe"> <Value>$(PythonExe)</Value> </BuildMacro> + <BuildMacro Include="tcltkDir"> + <Value>$(tcltkDir)</Value> + </BuildMacro> </ItemGroup> -</Project> +</Project>
\ No newline at end of file |