From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 6 Sep 2017 22:00:26 +0000 (-0700)
Subject: [3.6] Fixes Tix build by correcting the directories used by Tcl and Tk. (GH-3391... 
X-Git-Tag: v3.6.3rc1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34c67614c170a79bbe168ed2f3df5556c34f162b;p=thirdparty%2FPython%2Fcpython.git

[3.6] Fixes Tix build by correcting the directories used by Tcl and Tk. (GH-3391) (#3392)
---

diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj
index 3dfd155810ff..28b9270e9461 100644
--- a/PCbuild/tcl.vcxproj
+++ b/PCbuild/tcl.vcxproj
@@ -63,7 +63,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>
     <NMakeBuildCommandLine>setlocal
 @(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 57bb98aeebed..4261073bcb87 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -37,6 +37,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 a26318bbe786..747a8ff62412 100644
--- a/PCbuild/tk.vcxproj
+++ b/PCbuild/tk.vcxproj
@@ -62,7 +62,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>
     <NMakeBuildCommandLine>setlocal
 @(ExpectedOutputs->'if not exist "%(FullPath)" goto build','