From d3722e7b6f9f4a40bec7476479aef9f84395de2e Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 12 Mar 2016 08:38:55 -0800
Subject: Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch
 by Bjoern Thiel.

---
 Misc/NEWS           | 3 +++
 PCbuild/tcltk.props | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index df6ea42..b7a2617 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -306,6 +306,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 #24421: Compile Modules/_math.c once, before building extensions.
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
-- 
cgit v0.12