Skip to content

Commit

Permalink
RF: disable build-time link against TCL/Tk
Browse files Browse the repository at this point in the history
Disable link to TCL / Tk libraries now we are loading symbols at
run-time.
  • Loading branch information
matthew-brett committed May 18, 2016
1 parent fc5d060 commit 1c85968
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions setupext.py
Expand Up @@ -1726,17 +1726,12 @@ def add_flags(self, ext):
# includes are directly in the conda\library\include dir and
# libs in DLL or lib
ext.include_dirs.extend(['include'])
ext.libraries.extend(['tk85', 'tcl85'])
ext.library_dirs.extend(['dlls']) # or lib?
else:
major, minor1, minor2, s, tmp = sys.version_info
if sys.version_info[0:2] < (3, 4):
ext.include_dirs.extend(['win32_static/include/tcl85'])
ext.libraries.extend(['tk85', 'tcl85'])
else:
ext.include_dirs.extend(['win32_static/include/tcl86'])
ext.libraries.extend(['tk86t', 'tcl86t'])
ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])

elif sys.platform == 'darwin':
# this config section lifted directly from Imaging - thanks to
Expand Down Expand Up @@ -1781,10 +1776,7 @@ def add_flags(self, ext):
# not found...

# tk_include_dirs.append('/usr/X11R6/include')
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
ext.include_dirs.extend(tk_include_dirs)
ext.extra_link_args.extend(frameworks)
ext.extra_compile_args.extend(frameworks)

# you're still here? ok we'll try it this way...
else:
Expand Down Expand Up @@ -1817,8 +1809,6 @@ def add_flags(self, ext):
(tcl_lib_dir, tcl_inc_dir, tcl_lib,
tk_lib_dir, tk_inc_dir, tk_lib) = result
ext.include_dirs.extend([tcl_inc_dir, tk_inc_dir])
ext.library_dirs.extend([tcl_lib_dir, tk_lib_dir])
ext.libraries.extend([tcl_lib, tk_lib])


class BackendGtk(OptionalBackendPackage):
Expand Down

0 comments on commit 1c85968

Please sign in to comment.