- # check_cfg(), so just hard-code it all.
- conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0',
- 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
- conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
- if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE:
- conf.env.LIB_WXWIDGETS.append('Xxf86vm')
- conf.env.LIB_WXWIDGETS.append('Xext')
- conf.env.LIB_WXWIDGETS.append('X11')
+ # check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out.
+ stlibs = []
+ new_linkflags = []
+ stlib_paths = []
+ for f in conf.env.LINKFLAGS_WXWIDGETS:
+ if f.startswith('/'):
+ d = os.path.dirname(f)
+ if not d in stlib_paths:
+ stlib_paths.append(d)
+ stlibs.append(os.path.basename(f)[3:-2])
+ else:
+ new_linkflags.append(f)
+
+ conf.env.STLIB_WXWIDGETS = stlibs
+ conf.env.LINKFLAGS_WXWIDGETS = new_linkflags
+ conf.env.STLIBPATH_WXWIDGETS = stlib_paths