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

Merge pull request #1223 from RobinD42/more-build-tweaks

Browse Source 
More build tweaks

(cherry picked from commit d1b79db2a9)
This commit is contained in:
Robin Dunn
2019-05-13 19:58:15 -07:00
parent 384cc82709
commit 221a98e902
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildtools/build_wxwidgets.py
View File

@@ -280,10 +280,8 @@ def main(wxDir, args):
configure_opts.append("--with-gtk=2") configure_opts.append("--with-gtk=2")
wxpy_configure_opts = [ wxpy_configure_opts = [
"--with-opengl",
"--enable-sound", "--enable-sound",
"--enable-graphics_ctx", "--enable-graphics_ctx",
"--enable-mediactrl",
"--enable-display", "--enable-display",
"--enable-geometry", "--enable-geometry",
"--enable-debug_flag", "--enable-debug_flag",

BIN
samples/doodle/tmp.ddl
View File

Binary file not shown.

6
setup.py
View File

@@ -89,9 +89,9 @@ Programming Language :: Python :: Implementation :: CPython
Topic :: Software Development :: User Interfaces Topic :: Software Development :: User Interfaces
""" """
DEPENDENCIES = [ 'six', DEPENDENCIES = [ line.strip()
'Pillow', for line in open('requirements.txt').readlines()
] if not line.startswith('#')]
isWindows = sys.platform.startswith('win') isWindows = sys.platform.startswith('win')
isDarwin = sys.platform == "darwin" isDarwin = sys.platform == "darwin"

12
wscript
View File

@@ -221,8 +221,12 @@ def configure(conf):
uselib_store='WXHTML', mandatory=True, uselib_store='WXHTML', mandatory=True,
msg='Finding libs for WXHTML') msg='Finding libs for WXHTML')
if cfg.checkSetup(wxConfigDir, 'wxUSE_GLCANVAS'):
gl_libs = '--libs gl,core,net'
else:
gl_libs = '--libs core,net'
conf.check_cfg(path=conf.options.wx_config, package='', conf.check_cfg(path=conf.options.wx_config, package='',
args='--cxxflags --libs gl,core,net' + rpath, args='--cxxflags ' + gl_libs + rpath,
uselib_store='WXGL', mandatory=True, uselib_store='WXGL', mandatory=True,
msg='Finding libs for WXGL') msg='Finding libs for WXGL')
@@ -257,8 +261,12 @@ def configure(conf):
uselib_store='WXRICHTEXT', mandatory=True, uselib_store='WXRICHTEXT', mandatory=True,
msg='Finding libs for WXRICHTEXT') msg='Finding libs for WXRICHTEXT')
if cfg.checkSetup(wxConfigDir, 'wxUSE_MEDIACTRL'):
mc_libs = '--libs media,core,net'
else:
mc_libs = '--libs core,net'
conf.check_cfg(path=conf.options.wx_config, package='', conf.check_cfg(path=conf.options.wx_config, package='',
args='--cxxflags --libs media,core,net' + rpath, args='--cxxflags ' + mc_libs + rpath,
uselib_store='WXMEDIA', mandatory=True, uselib_store='WXMEDIA', mandatory=True,
msg='Finding libs for WXMEDIA') msg='Finding libs for WXMEDIA')