diff options
| author | David Robillard <d@drobilla.net> | 2017-03-17 22:32:36 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2017-03-17 22:32:36 +0100 |
| commit | 64a2647d8d81b5c23d22b52cc9e0dd2595270b67 (patch) | |
| tree | 0457994c528d45710722c5428ce10c2ae7a1c1d1 /wscript | |
| parent | 2b4b9d1ceaecf9940c5a28c3e69327059d0017ff (diff) | |
| download | suil-64a2647d8d81b5c23d22b52cc9e0dd2595270b67.tar.gz suil-64a2647d8d81b5c23d22b52cc9e0dd2595270b67.tar.bz2 suil-64a2647d8d81b5c23d22b52cc9e0dd2595270b67.zip | |
Remove X11 hackery and use Qt5 facilities to embed Gtk
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -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', |