From 8fcbdf19755f37592c67deb2c61f5470a1852ea4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 6 Jun 2019 21:03:16 +0200 Subject: Add support for Qt5 in Gtk3 --- wscript | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 0823980..f02a181 100644 --- a/wscript +++ b/wscript @@ -118,6 +118,9 @@ def configure(conf): if conf.env.HAVE_GTK3 and conf.env.HAVE_GTK3_X11: autowaf.define(conf, 'SUIL_WITH_X11_IN_GTK3', 1) + if conf.env.HAVE_GTK3 and conf.env.HAVE_QT5: + autowaf.define(conf, 'SUIL_WITH_QT5_IN_GTK3', 1) + if conf.env.HAVE_GTK2 and conf.env.HAVE_GTK2_QUARTZ: autowaf.define(conf, 'SUIL_WITH_COCOA_IN_GTK2', 1) @@ -174,6 +177,7 @@ def configure(conf): ('win', 'gtk2'), ('x11', 'gtk2'), ('x11', 'gtk3'), + ('qt5', 'gtk3'), ('x11', 'qt4'), ('x11', 'qt5'), ('cocoa', 'qt5')] @@ -271,7 +275,7 @@ def build(bld): if bld.env.SUIL_WITH_QT5_IN_GTK2: obj = bld(features = 'cxx cxxshlib', - source = 'src/qt5_in_gtk2.cpp', + source = 'src/qt5_in_gtk.cpp', target = 'suil_qt5_in_gtk2', includes = ['.'], defines = ['SUIL_SHARED', 'SUIL_INTERNAL'], @@ -305,6 +309,18 @@ def build(bld): uselib = 'GTK3 GTK3_X11 LV2', linkflags = bld.env.NODELETE_FLAGS) + if bld.env.SUIL_WITH_QT5_IN_GTK3: + obj = bld(features = 'cxx cxxshlib', + source = 'src/qt5_in_gtk.cpp', + target = 'suil_qt5_in_gtk3', + includes = ['.'], + defines = ['SUIL_SHARED', 'SUIL_INTERNAL'], + install_path = module_dir, + cflags = cflags, + lib = modlib, + uselib = 'GTK3 QT5 LV2', + linkflags = bld.env.NODELETE_FLAGS) + if bld.env.SUIL_WITH_COCOA_IN_GTK2: obj = bld(features = 'cxx cshlib', source = 'src/cocoa_in_gtk2.mm', -- cgit v1.2.1