diff options
author | Steve Dower <steve.dower@microsoft.com> | 2016-03-12 16:38:55 (GMT) |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2016-03-12 16:38:55 (GMT) |
commit | d3722e7b6f9f4a40bec7476479aef9f84395de2e (patch) | |
tree | 42cd5b8588433ecdc745fb70eaddd432e9b0b87a | |
parent | d669b6bd0ac449c1d311f83dfed9abc34704db17 (diff) | |
download | cpython-d3722e7b6f9f4a40bec7476479aef9f84395de2e.zip cpython-d3722e7b6f9f4a40bec7476479aef9f84395de2e.tar.gz cpython-d3722e7b6f9f4a40bec7476479aef9f84395de2e.tar.bz2 |
Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by Bjoern Thiel.
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | PCbuild/tcltk.props | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -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 |