diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2023-01-08 00:35:00 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2023-01-08 00:38:33 +0000 |
| commit | 9cc354c4e8186668fa78c5c57388b718d3400683 (patch) | |
| tree | 45d59b0bb9e8ec263c26790e9f76bb9e97fbf9b3 | |
| parent | 66114a981cea7f5ae1bb82994989d9480659835b (diff) | |
| download | gobject-introspection-9cc354c4e8186668fa78c5c57388b718d3400683.tar.gz | |
build: Add missing header and symbols
Now that GLib has separate version annotation macros, we need to define
GOBJECT_COMPILATION and parse gobject-visibility.h when generating the
introspection data for GLib.
This MR also requires:
- GNOME/glib!3184
- GNOME/glib!3185
| -rw-r--r-- | gir/meson.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gir/meson.build b/gir/meson.build index 048e06f3..da23e422 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -107,6 +107,7 @@ if dep_type == 'pkgconfig' glib_libdir = get_option('gi_cross_pkgconfig_sysroot_path') + glib_dep.get_variable(pkgconfig: 'libdir') glib_incdir = get_option('gi_cross_pkgconfig_sysroot_path') + join_paths(glib_dep.get_variable(pkgconfig: 'includedir'), 'glib-2.0') glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') + glib_files += join_paths(glib_incdir, 'gobject', 'gobject-visibility.h') glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') glib_files += join_paths(glib_libincdir, 'glibconfig.h') if giounix_dep.found() @@ -241,6 +242,7 @@ glib_gir = custom_target('gir-glib', command: glib_command + [ '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ '-DGLIB_COMPILATION', + '-DGOBJECT_COMPILATION', '-D__G_I18N_LIB_H__', '-DGETTEXT_PACKAGE=Dummy', '--cflags-end', @@ -308,6 +310,7 @@ gobject_gir = custom_target('gir-gobject', command: gobject_command + [ '--include-uninstalled=' + glib_gir.full_path(), '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ + '-DGLIB_COMPILATION', '-DGOBJECT_COMPILATION', '--cflags-end', '@INPUT@', |