diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-06 20:55:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 20:55:42 (GMT) |
| commit | 5d578442ed5ba5025e465b384341cb8646ffd819 (patch) | |
| tree | b875ac5cee92525ef34941ea5fcd80123a66a060 | |
| parent | 6d51b876121e472d4372496d609a26d7e3081c51 (diff) | |
| download | cpython-5d578442ed5ba5025e465b384341cb8646ffd819.zip cpython-5d578442ed5ba5025e465b384341cb8646ffd819.tar.gz cpython-5d578442ed5ba5025e465b384341cb8646ffd819.tar.bz2 | |
Fixes Tix build by correcting the directories used by Tcl and Tk. (#3391)
| -rw-r--r-- | PCbuild/tcl.vcxproj | 2 | ||||
| -rw-r--r-- | PCbuild/tcltk.props | 1 | ||||
| -rw-r--r-- | PCbuild/tk.vcxproj | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj index c940ab1..4536cbc 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 b913d34..cad52b8 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 a1b8b9e..70b5459 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 |