Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 19:10:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optionally return an empty list from makeLibName if we're using the monolithic wx lib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-03-23 01:54:42 +00:00
parent 78f2d605b8
commit b0298e71e5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/config.py
View File

@@ -418,7 +418,9 @@ class Configuration(object):
return file_list 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': if os.name == 'posix' or self.COMPILER == 'mingw32':
libname = '%s_%s-%s' % (self.WXBASENAME, name, self.WXRELEASE) libname = '%s_%s-%s' % (self.WXBASENAME, name, self.WXRELEASE)
elif name: elif name:

5
setup.py
View File

@@ -153,6 +153,7 @@ extensions.append(ext)
cfg.CLEANUP.append(opj(cfg.PKGDIR, 'core.py')) cfg.CLEANUP.append(opj(cfg.PKGDIR, 'core.py'))
etg = loadETG('etg/_adv.py') etg = loadETG('etg/_adv.py')
etgDepends = etg.DEPENDS + etg.OTHERDEPS etgDepends = etg.DEPENDS + etg.OTHERDEPS
ext = Extension('_adv', getEtgSipCppFiles(etg), ext = Extension('_adv', getEtgSipCppFiles(etg),
@@ -160,7 +161,7 @@ ext = Extension('_adv', getEtgSipCppFiles(etg),
include_dirs = cfg.includes, include_dirs = cfg.includes,
define_macros = cfg.defines, define_macros = cfg.defines,
library_dirs = cfg.libdirs, library_dirs = cfg.libdirs,
libraries = cfg.libs + cfg.makeLibName('adv'), libraries = cfg.libs + cfg.makeLibName('adv', True),
extra_compile_args = cfg.cflags, extra_compile_args = cfg.cflags,
extra_link_args = cfg.lflags, extra_link_args = cfg.lflags,
) )
@@ -175,7 +176,7 @@ ext = Extension('_dataview', getEtgSipCppFiles(etg),
include_dirs = cfg.includes, include_dirs = cfg.includes,
define_macros = cfg.defines, define_macros = cfg.defines,
library_dirs = cfg.libdirs, library_dirs = cfg.libdirs,
libraries = cfg.libs + cfg.makeLibName('adv'), libraries = cfg.libs + cfg.makeLibName('adv', True),
extra_compile_args = cfg.cflags, extra_compile_args = cfg.cflags,
extra_link_args = cfg.lflags, extra_link_args = cfg.lflags,
) )