From b0298e71e5bd03fef14565374c97f8eefc3f7d1d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 23 Mar 2012 01:54:42 +0000 Subject: [PATCH] Optionally return an empty list from makeLibName if we're using the monolithic wx lib git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- buildtools/config.py | 4 +++- setup.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildtools/config.py b/buildtools/config.py index 821b3899..dea54051 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -418,7 +418,9 @@ class Configuration(object): return file_list - def makeLibName(self, name): + def makeLibName(self, name, checkMonolithic=False): + if checkMonolithic and self.MONOLITHIC: + return [] if os.name == 'posix' or self.COMPILER == 'mingw32': libname = '%s_%s-%s' % (self.WXBASENAME, name, self.WXRELEASE) elif name: diff --git a/setup.py b/setup.py index 0fde49c3..0dc5b43a 100644 --- a/setup.py +++ b/setup.py @@ -153,6 +153,7 @@ extensions.append(ext) cfg.CLEANUP.append(opj(cfg.PKGDIR, 'core.py')) + etg = loadETG('etg/_adv.py') etgDepends = etg.DEPENDS + etg.OTHERDEPS ext = Extension('_adv', getEtgSipCppFiles(etg), @@ -160,7 +161,7 @@ ext = Extension('_adv', getEtgSipCppFiles(etg), include_dirs = cfg.includes, define_macros = cfg.defines, library_dirs = cfg.libdirs, - libraries = cfg.libs + cfg.makeLibName('adv'), + libraries = cfg.libs + cfg.makeLibName('adv', True), extra_compile_args = cfg.cflags, extra_link_args = cfg.lflags, ) @@ -175,7 +176,7 @@ ext = Extension('_dataview', getEtgSipCppFiles(etg), include_dirs = cfg.includes, define_macros = cfg.defines, library_dirs = cfg.libdirs, - libraries = cfg.libs + cfg.makeLibName('adv'), + libraries = cfg.libs + cfg.makeLibName('adv', True), extra_compile_args = cfg.cflags, extra_link_args = cfg.lflags, )