Skip to content

Commit 5bc2357

Browse files
committed
Merge pull request matplotlib#2613 from cgohlke/patch-1
BLD Fix build failure on Python 3.4b1 for Windows
2 parents b4ed0f9 + edb8cb3 commit 5bc2357

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

setupext.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,12 @@ def hardcoded_tcl_config(self):
13291329
def add_flags(self, ext):
13301330
if sys.platform == 'win32':
13311331
major, minor1, minor2, s, tmp = sys.version_info
1332-
ext.include_dirs.extend(['win32_static/include/tcl85'])
1333-
ext.libraries.extend(['tk85', 'tcl85'])
1332+
if sys.version_info[0:2] < (3, 4):
1333+
ext.include_dirs.extend(['win32_static/include/tcl85'])
1334+
ext.libraries.extend(['tk85', 'tcl85'])
1335+
else:
1336+
ext.include_dirs.extend(['win32_static/include/tcl86'])
1337+
ext.libraries.extend(['tk86t', 'tcl86t'])
13341338
ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
13351339

13361340
elif sys.platform == 'darwin':

0 commit comments

Comments
 (0)