From d1e2d39b5a936f71595a2b9b372cafe9d884483e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Mar 2023 17:39:15 +0100 Subject: meson: fix a typo in a variable name this made meson fail on Windows --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index aff697b3..944c36b0 100644 --- a/meson.build +++ b/meson.build @@ -62,7 +62,7 @@ at_spi_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) # Symbol visibility if get_option('default_library') != 'static' if host_system == 'windows' - atspi_conf.set('DLL_EXPORT', true) + at_spi_conf.set('DLL_EXPORT', true) at_spi_conf.set('_ATK_EXTERN', '__declspec(dllexport) extern') if cc.get_id() != 'msvc' test_cflags += ['-fvisibility=hidden'] -- cgit v1.2.1 From c3e2e480cf7e8587be26fd1174672c295b3f2f9c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Mar 2023 17:40:11 +0100 Subject: meson: don't require dlopen for atk only builds atk doesn't need it. This allows building atk alone on Windows --- meson.build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 944c36b0..84d872d7 100644 --- a/meson.build +++ b/meson.build @@ -134,12 +134,14 @@ endif glib_dep = dependency('glib-2.0', version: glib_req_version) gobject_dep = dependency('gobject-2.0', version: gobject_req_version) gio_dep = dependency('gio-2.0', version: gio_req_version) -if cc.has_function('dlopen') - dl_dep = [] -elif cc.has_function('dlopen', args: '-ldl') - dl_dep = cc.find_library('dl') -else - error('Could not find a library with the dlopen function') +if not get_option('atk_only') + if cc.has_function('dlopen') + dl_dep = [] + elif cc.has_function('dlopen', args: '-ldl') + dl_dep = cc.find_library('dl') + else + error('Could not find a library with the dlopen function') + endif endif gmodule_dep = dependency('gmodule-2.0', version: gmodule_req_version) libxml_dep = dependency('libxml-2.0', version: libxml_req_version) -- cgit v1.2.1