luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'girepository-static' into 'main'

Browse Source 
girepository: Fix static build under Windows

See merge request GNOME/glib!3937
This commit is contained in:
Philip Withnall 2024-02-26 10:55:21 +00:00
commit c9d3295909
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
girepository/meson.build
View File

@ -182,7 +182,7 @@ if cc.get_id() != 'msvc'
]) ])
endif endif
libgirepository = shared_library('girepository-2.0', libgirepository = library('girepository-2.0',
sources: girepo_sources + girepo_ffi_sources + [gi_visibility_h], sources: girepo_sources + girepo_ffi_sources + [gi_visibility_h],
include_directories: [configinc, girepoinc], include_directories: [configinc, girepoinc],
c_args: gir_c_args, c_args: gir_c_args,

1
glib/glibconfig.h.in
View File

@ -16,6 +16,7 @@
#mesondefine GOBJECT_STATIC_COMPILATION #mesondefine GOBJECT_STATIC_COMPILATION
#mesondefine GIO_STATIC_COMPILATION #mesondefine GIO_STATIC_COMPILATION
#mesondefine GMODULE_STATIC_COMPILATION #mesondefine GMODULE_STATIC_COMPILATION
#mesondefine GI_STATIC_COMPILATION
#mesondefine G_INTL_STATIC_COMPILATION #mesondefine G_INTL_STATIC_COMPILATION
#mesondefine FFI_STATIC_BUILD #mesondefine FFI_STATIC_BUILD

1
meson.build
View File

@ -316,6 +316,7 @@ if glib_build_static_only
glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1') glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1')
glibconfig_conf.set('GIO_STATIC_COMPILATION', '1') glibconfig_conf.set('GIO_STATIC_COMPILATION', '1')
glibconfig_conf.set('GMODULE_STATIC_COMPILATION', '1') glibconfig_conf.set('GMODULE_STATIC_COMPILATION', '1')
glibconfig_conf.set('GI_STATIC_COMPILATION', '1')
glibconfig_conf.set('G_INTL_STATIC_COMPILATION', '1') glibconfig_conf.set('G_INTL_STATIC_COMPILATION', '1')
glibconfig_conf.set('FFI_STATIC_BUILD', '1') glibconfig_conf.set('FFI_STATIC_BUILD', '1')
endif endif

2
tools/gen-visibility-macros.py
View File

@ -81,7 +81,7 @@ def gen_visibility_macros(args, current_minor_version):
- GLIB_UNAVAILABLE(maj,min) - GLIB_UNAVAILABLE(maj,min)
- GLIB_UNAVAILABLE_STATIC_INLINE(maj,min) - GLIB_UNAVAILABLE_STATIC_INLINE(maj,min)
The GLIB namespace can be replaced with one of GOBJECT, GIO, GMODULE. The GLIB namespace can be replaced with one of GOBJECT, GIO, GMODULE, GI.
""" """
ns = args.namespace ns = args.namespace