From 2d18caf46d9c279fb193dc2a460d53d93b3717b5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 29 May 2022 14:57:25 -0400 Subject: Fix MacOS build I can't for the life of me figure out how to do this portably with C++ casts, since the native types are very different between platforms (pointer on MacOS, integer on X11). So, just give up and go back to C casts here. --- wscript | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index f7cdddf..2543c65 100644 --- a/wscript +++ b/wscript @@ -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: -- cgit v1.2.1