From 64a2647d8d81b5c23d22b52cc9e0dd2595270b67 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 17 Mar 2017 22:32:36 +0100 Subject: Remove X11 hackery and use Qt5 facilities to embed Gtk --- wscript | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9f4c076..7d9f185 100644 --- a/wscript +++ b/wscript @@ -95,8 +95,6 @@ def configure(conf): if not Options.options.no_qt5: autowaf.check_pkg(conf, 'Qt5Widgets', uselib_store='QT5', atleast_version='5.1.0', mandatory=False) - autowaf.check_pkg(conf, 'Qt5X11Extras', uselib_store='QT5_X11', - atleast_version='5.1.0', mandatory=False) conf.check_cc(define_name = 'HAVE_LIBDL', lib = 'dl', @@ -115,8 +113,6 @@ def configure(conf): if conf.env.HAVE_GTK2 and conf.env.HAVE_QT5: autowaf.define(conf, 'SUIL_WITH_GTK2_IN_QT5', 1) - - if conf.env.HAVE_GTK2 and conf.env.HAVE_QT5_X11: autowaf.define(conf, 'SUIL_WITH_QT5_IN_GTK2', 1) if conf.env.HAVE_GTK2 and conf.env.HAVE_GTK2_X11: @@ -276,9 +272,9 @@ def build(bld): defines = ['SUIL_SHARED', 'SUIL_INTERNAL'], install_path = module_dir, cxxflags = cflags, - lib = modlib + ['X11'], + lib = modlib, linkflags = bld.env.NODELETE_FLAGS) - autowaf.use_lib(bld, obj, 'GTK2 QT5 QT5_X11 LV2') + autowaf.use_lib(bld, obj, 'GTK2 QT5 LV2') if bld.env.SUIL_WITH_X11_IN_GTK2: obj = bld(features = 'c cshlib', -- cgit v1.2.1