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

Don't unconditionally use the adv and html libs in MSW builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-03-22 21:37:02 +00:00
parent 838199f9f0
commit 0358c27467
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildtools/config.py
View File

@@ -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',

4
setup.py
View File

@@ -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,
)