diff options
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | src/gtk2_in_qt5.cpp | 4 | ||||
-rw-r--r-- | src/qt5_in_gtk.cpp | 2 | ||||
m--------- | waflib | 0 | ||||
-rw-r--r-- | wscript | 12 |
5 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,9 @@ +suil (0.10.13) unstable; + + * Fix MacOS build + + -- David Robillard <d@drobilla.net> Sun, 29 May 2022 18:58:06 +0000 + suil (0.10.12) stable; * Fix build issues with newer toolchains diff --git a/src/gtk2_in_qt5.cpp b/src/gtk2_in_qt5.cpp index a5c98f1..47c8271 100644 --- a/src/gtk2_in_qt5.cpp +++ b/src/gtk2_in_qt5.cpp @@ -41,6 +41,7 @@ SUIL_DISABLE_GTK_WARNINGS #include <gtk/gtk.h> SUIL_RESTORE_WARNINGS +#include <cstdint> #include <cstdlib> extern "C" { @@ -95,8 +96,7 @@ wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance) gtk_container_add(GTK_CONTAINER(plug), widget); gtk_widget_show_all(plug); - const WId wid = - static_cast<WId>(gtk_plug_get_id(reinterpret_cast<GtkPlug*>(plug))); + const WId wid = (WId)gtk_plug_get_id(GTK_PLUG(plug)); QWindow* window = QWindow::fromWinId(wid); QWidget* container = diff --git a/src/qt5_in_gtk.cpp b/src/qt5_in_gtk.cpp index 6277daa..1c614c7 100644 --- a/src/qt5_in_gtk.cpp +++ b/src/qt5_in_gtk.cpp @@ -125,7 +125,7 @@ suil_qt_wrapper_realize(GtkWidget* w, gpointer) { SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(w); GtkSocket* const s = GTK_SOCKET(w); - const WId id = static_cast<WId>(gtk_socket_get_id(s)); + const WId id = (WId)gtk_socket_get_id(s); wrap->qembed->winId(); wrap->qembed->windowHandle()->setParent(QWindow::fromWinId(id)); diff --git a/waflib b/waflib -Subproject b600c928b221a001faeab7bd92786d0b25714bc +Subproject aeef9f5fdf416d9b68c61c75de7dae409f1ac6a @@ -4,7 +4,7 @@ from waflib import Build, Logs, Options, TaskGen from waflib.extras import autowaf # Semver package/library version -SUIL_VERSION = '0.10.12' +SUIL_VERSION = '0.10.13' SUIL_MAJOR_VERSION = SUIL_VERSION[0:SUIL_VERSION.find('.')] # Mandatory waf variables @@ -154,11 +154,11 @@ def configure(conf): system=True, mandatory=False) - if not conf.options.no_cocoa: - if conf.check_cxx(header_name = 'QMacCocoaViewContainer', - uselib = 'QT5_COCOA', + if conf.env.DEST_OS == 'darwin' and not conf.options.no_cocoa: + if conf.check_cxx(header_name='QMacCocoaViewContainer', + uselib='QT5', system=True, - mandatory = False): + mandatory=False): enable_module('SUIL_WITH_COCOA_IN_QT5') conf.check_cc(define_name = 'HAVE_LIBDL', @@ -389,7 +389,7 @@ def build(bld): install_path = module_dir, cflags = cflags, lib = modlib, - uselib = 'QT5 QT5_COCOA LV2', + uselib = 'QT5 LV2', linkflags = ['-framework', 'Cocoa']) if bld.env.SUIL_WITH_X11: |