From 0358c274677e840e089984234dcfbde70bbfa81b Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 22 Mar 2012 21:37:02 +0000 Subject: [PATCH] Don't unconditionally use the adv and html libs in MSW builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- buildtools/config.py | 3 --- setup.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/buildtools/config.py b/buildtools/config.py index 0d851bf5..821b3899 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -177,10 +177,7 @@ class Configuration(object): else: self.libs += [ 'wxbase' + self.WXDLLVER + self.libFlag(), 'wxbase' + self.WXDLLVER + self.libFlag() + '_net', - 'wxbase' + self.WXDLLVER + self.libFlag() + '_xml', self.makeLibName('core')[0], - self.makeLibName('adv')[0], - self.makeLibName('html')[0], ] self.libs += ['kernel32', 'user32', 'gdi32', 'comdlg32', diff --git a/setup.py b/setup.py index d9599a35..0fde49c3 100644 --- a/setup.py +++ b/setup.py @@ -160,7 +160,7 @@ ext = Extension('_adv', getEtgSipCppFiles(etg), include_dirs = cfg.includes, define_macros = cfg.defines, library_dirs = cfg.libdirs, - libraries = cfg.libs, + libraries = cfg.libs + cfg.makeLibName('adv'), extra_compile_args = cfg.cflags, extra_link_args = cfg.lflags, ) @@ -175,7 +175,7 @@ ext = Extension('_dataview', getEtgSipCppFiles(etg), include_dirs = cfg.includes, define_macros = cfg.defines, library_dirs = cfg.libdirs, - libraries = cfg.libs, + libraries = cfg.libs + cfg.makeLibName('adv'), extra_compile_args = cfg.cflags, extra_link_args = cfg.lflags, )