diff options
| author | Mike Gorse <mgorse@suse.com> | 2023-03-27 17:01:47 +0000 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2023-03-27 17:01:47 +0000 |
| commit | e9f3abdcdd1224c64fa3f0b2c3e23bfc4aff3ebf (patch) | |
| tree | aa4d31f77024f69dd8b5912eda1a09535c228b0f | |
| parent | d963aff7f6977e50517fb2ffe8b31f1db142107d (diff) | |
| parent | c3e2e480cf7e8587be26fd1174672c295b3f2f9c (diff) | |
| download | at-spi2-core-e9f3abdcdd1224c64fa3f0b2c3e23bfc4aff3ebf.tar.gz | |
Merge branch 'windows-fixes' into 'main'
meson: some Windows fixes for atk only builds
See merge request GNOME/at-spi2-core!132
| -rw-r--r-- | meson.build | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/meson.build b/meson.build index aff697b3..84d872d7 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'] @@ -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) |