Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 34c6761

Browse files
miss-islingtonzooba
miss-islington
authored and
zooba
committed
[3.6] Fixes Tix build by correcting the directories used by Tcl and Tk. (GH-3391) (#3392)
1 parent 98ceece commit 34c6761

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

‎PCbuild/tcl.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<PropertyGroup>
6464
<TclOpts>msvcrt</TclOpts>
6565
<TclOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TclOpts>
66-
<TclDirs>INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
66+
<TclDirs>BUILDDIRTOP="$(BuildDirTop)" INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
6767
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
6868
<NMakeBuildCommandLine>setlocal
6969
@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','

‎PCbuild/tcltk.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<BuildDirTop>Release</BuildDirTop>
3838
<BuildDirTop Condition="$(Configuration) == 'Debug'">Debug</BuildDirTop>
3939
<BuildDirTop Condition="$(TclMachine) != 'IX86'">$(BuildDirTop)_$(TclMachine)</BuildDirTop>
40+
<BuildDirTop Condition="$(PlatformToolset) == 'v141'">$(BuildDirTop)_VC13</BuildDirTop>
4041
<BuildDirTop Condition="$(PlatformToolset) == 'v140'">$(BuildDirTop)_VC13</BuildDirTop>
4142
<BuildDirTop Condition="$(PlatformToolset) == 'v120'">$(BuildDirTop)_VC12</BuildDirTop>
4243
<BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>

‎PCbuild/tk.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<PropertyGroup>
6363
<TkOpts>msvcrt</TkOpts>
6464
<TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
65-
<TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
65+
<TkDirs>BUILDDIRTOP="$(BuildDirTop)" TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
6666
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
6767
<NMakeBuildCommandLine>setlocal
6868
@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','

0 commit comments

Comments
 (0)