From 221a98e902d8998375f4641be8cf9b5074083d2a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 13 May 2019 19:58:15 -0700 Subject: [PATCH] Merge pull request #1223 from RobinD42/more-build-tweaks More build tweaks (cherry picked from commit d1b79db2a96341847083dc8f5996e8d7ab9a1c2e) --- buildtools/build_wxwidgets.py | 2 -- samples/doodle/tmp.ddl | Bin 11023 -> 0 bytes setup.py | 6 +++--- wscript | 12 ++++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 samples/doodle/tmp.ddl diff --git a/buildtools/build_wxwidgets.py b/buildtools/build_wxwidgets.py index 7da3bd02..9d4c5681 100644 --- a/buildtools/build_wxwidgets.py +++ b/buildtools/build_wxwidgets.py @@ -280,10 +280,8 @@ def main(wxDir, args): configure_opts.append("--with-gtk=2") wxpy_configure_opts = [ - "--with-opengl", "--enable-sound", "--enable-graphics_ctx", - "--enable-mediactrl", "--enable-display", "--enable-geometry", "--enable-debug_flag", diff --git a/samples/doodle/tmp.ddl b/samples/doodle/tmp.ddl deleted file mode 100644 index ae6b3e98b139575be604b73869fb77ed23b7af27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11023 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 Xq60TArPh~M8_KJVQ1}NAThaReAUci2 diff --git a/setup.py b/setup.py index 63ce99b3..08142d34 100644 --- a/setup.py +++ b/setup.py @@ -89,9 +89,9 @@ Programming Language :: Python :: Implementation :: CPython Topic :: Software Development :: User Interfaces """ -DEPENDENCIES = [ 'six', - 'Pillow', - ] +DEPENDENCIES = [ line.strip() + for line in open('requirements.txt').readlines() + if not line.startswith('#')] isWindows = sys.platform.startswith('win') isDarwin = sys.platform == "darwin" diff --git a/wscript b/wscript index 89961a3a..058cdb3d 100644 --- a/wscript +++ b/wscript @@ -221,8 +221,12 @@ def configure(conf): uselib_store='WXHTML', mandatory=True, 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='', - args='--cxxflags --libs gl,core,net' + rpath, + args='--cxxflags ' + gl_libs + rpath, uselib_store='WXGL', mandatory=True, msg='Finding libs for WXGL') @@ -257,8 +261,12 @@ def configure(conf): uselib_store='WXRICHTEXT', mandatory=True, 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='', - args='--cxxflags --libs media,core,net' + rpath, + args='--cxxflags ' + mc_libs + rpath, uselib_store='WXMEDIA', mandatory=True, msg='Finding libs for WXMEDIA')