summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-03-12 16:39:07 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-03-12 16:39:07 (GMT)
commit8d9bcb5d627df6298abea3c32b6c62d5bcaa7010 (patch)
treeec1535ff752ca50e5497671b38bfedb40b710603
parent6d6b986d90ce80d89391876b5c1b81eab2546bb0 (diff)
parentd3722e7b6f9f4a40bec7476479aef9f84395de2e (diff)
downloadcpython-8d9bcb5d627df6298abea3c32b6c62d5bcaa7010.zip
cpython-8d9bcb5d627df6298abea3c32b6c62d5bcaa7010.tar.gz
cpython-8d9bcb5d627df6298abea3c32b6c62d5bcaa7010.tar.bz2
Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by Bjoern Thiel.
-rw-r--r--Misc/NEWS3
-rw-r--r--PCbuild/tcltk.props8
2 files changed, 7 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c994a0a..91193a6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -811,6 +811,9 @@ Tests
Build
-----
+- Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by
+ Bjoern Thiel.
+
- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
- Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 5e794e5..11dbffb 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -37,9 +37,9 @@
<BuildDirTop>Release</BuildDirTop>
<BuildDirTop Condition="$(Configuration) == 'Debug'">Debug</BuildDirTop>
<BuildDirTop Condition="$(TclMachine) != 'IX86'">$(BuildDirTop)_$(TclMachine)</BuildDirTop>
- <BuildDirTop Condition="$(VisualStudioVersion) == '14.0'">$(BuildDirTop)_VC13</BuildDirTop>
- <BuildDirTop Condition="$(VisualStudioVersion) == '12.0'">$(BuildDirTop)_VC12</BuildDirTop>
- <BuildDirTop Condition="$(VisualStudioVersion) == '11.0'">$(BuildDirTop)_VC11</BuildDirTop>
- <BuildDirTop Condition="$(VisualStudioVersion) == '10.0'">$(BuildDirTop)_VC10</BuildDirTop>
+ <BuildDirTop Condition="$(PlatformToolset) == 'v140'">$(BuildDirTop)_VC13</BuildDirTop>
+ <BuildDirTop Condition="$(PlatformToolset) == 'v120'">$(BuildDirTop)_VC12</BuildDirTop>
+ <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>
+ <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop>
</PropertyGroup>
</Project> \ No newline at end of file