[Python-checkins] Fixes Tix build by correcting the directories used by Tcl and Tk. (#3391)

Wed Sep 6 16:55:47 EDT 2017

https://github.com/python/cpython/commit/5d578442ed5ba5025e465b384341cb8646ffd819
commit: 5d578442ed5ba5025e465b384341cb8646ffd819
branch: master
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2017年09月06日T13:55:42-07:00
summary:
Fixes Tix build by correcting the directories used by Tcl and Tk. (#3391)
files:
M PCbuild/tcl.vcxproj
M PCbuild/tcltk.props
M PCbuild/tk.vcxproj

diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj
index c940ab186f7..4536cbc925b 100644
--- a/PCbuild/tcl.vcxproj
+++ b/PCbuild/tcl.vcxproj
@@ -53,7 +53,7 @@
 <PropertyGroup>
 <TclOpts>msvcrt</TclOpts>
 <TclOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TclOpts>
- <TclDirs>INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
+ <TclDirs>BUILDDIRTOP="$(BuildDirTop)" INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
 <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
 <WarningsFlags>WARNINGS="-W3 -wd4311 -wd4312"</WarningsFlags>
 <NMakeBuildCommandLine>setlocal
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index b913d34b0bd..cad52b8f022 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -36,6 +36,7 @@
 <BuildDirTop>Release</BuildDirTop>
 <BuildDirTop Condition="$(Configuration) == 'Debug'">Debug</BuildDirTop>
 <BuildDirTop Condition="$(TclMachine) != 'IX86'">$(BuildDirTop)_$(TclMachine)</BuildDirTop>
+ <BuildDirTop Condition="$(PlatformToolset) == 'v141'">$(BuildDirTop)_VC13</BuildDirTop>
 <BuildDirTop Condition="$(PlatformToolset) == 'v140'">$(BuildDirTop)_VC13</BuildDirTop>
 <BuildDirTop Condition="$(PlatformToolset) == 'v120'">$(BuildDirTop)_VC12</BuildDirTop>
 <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>
diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj
index a1b8b9e10e8..70b5459a081 100644
--- a/PCbuild/tk.vcxproj
+++ b/PCbuild/tk.vcxproj
@@ -54,7 +54,7 @@
 <PropertyGroup>
 <TkOpts>msvcrt</TkOpts>
 <TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
- <TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
+ <TkDirs>BUILDDIRTOP="$(BuildDirTop)" TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
 <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
 <WarningsFlags>WARNINGS="-W3 -wd4244 -wd4267 -wd4311 -wd4312 -wd4334"</WarningsFlags>
 <NMakeBuildCommandLine>setlocal
