From 083e6affcf2cb38ca801ee796c9bfaf44dfdeb4d Mon Sep 17 00:00:00 2001 From: Danny 'Guru' Forghieri Date: Wed, 25 Oct 2017 23:10:57 +0200 Subject: Declaration to export functions in girepository.dll/.lib, flag for skipping the build of the gir files. --- meson.build | 15 ++++++++++++--- meson_options.txt | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 378ffcf7..ba888e36 100644 --- a/meson.build +++ b/meson.build @@ -40,21 +40,30 @@ if cc.has_argument('-fvisibility=hidden') '-D_GI_EXTERN=__attribute__((visibility("default"))) extern', '-fvisibility=hidden', ] +elif cc.get_id() == 'msvc' + gi_hidden_visibility_cflags = [ + '-D_GI_EXTERN=__declspec (dllexport) extern', + ] endif -gobject_dep = dependency('gobject-2.0', version: '>= 2.55.0') +gobject_dep = dependency('gobject-2.0', version: '>= 2.52.0') gio_dep = dependency('gio-2.0') giounix_dep = dependency('gio-unix-2.0', required: false) gmodule_dep = dependency('gmodule-2.0') libffi_dep = dependency('libffi') +gir_build = get_option('gir_build') subdir('girepository') subdir('tools') subdir('giscanner') -subdir('gir') +if gir_build + ### To do in a second time + subdir('gir') +endif subdir('examples') subdir('docs') -subdir('tests') +### Missing meson.build file +### subdir('tests') install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) diff --git a/meson_options.txt b/meson_options.txt index e9d21e93..3d113cb5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,3 +9,7 @@ option('doctool', type: 'boolean', option('glib-src-dir', type: 'string', description: 'Source directory for glib - needed to add docs to gir' ) + +option('gir_build', type: 'boolean', + description: 'Windows: post build (gir) stuff' +) -- cgit v1.2.1