diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-03-08 18:44:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-03-08 18:44:46 +0000 |
| commit | bdd35c16952fcb57bcfc53d62f266ecc3899db72 (patch) | |
| tree | e17a65c875ba7dc1b2dd2a0f554106a4eab1e21b /meson.build | |
| parent | 14a5c78d805ff712389ebf37d9f0fbaeda483aec (diff) | |
| parent | 432e8664e1eb24c81bbcf1927f0de257bae7e038 (diff) | |
| download | gtk+-bdd35c16952fcb57bcfc53d62f266ecc3899db72.tar.gz | |
Merge branch 'fix-msvc-older-glib' into 'main'
modules/media: Fix Visual Studio builds with older GLib (<= 2.74.x)
See merge request GNOME/gtk!5605
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meson.build b/meson.build index e89ce6872a..13517714b7 100644 --- a/meson.build +++ b/meson.build @@ -370,6 +370,13 @@ glib_dep = dependency('glib-2.0', version: glib_req) gobject_dep = dependency('gobject-2.0', version: glib_req) if os_win32 giowin32_dep = dependency('gio-windows-2.0', version: glib_req, required: win32_enabled) + if giowin32_dep.version().version_compare('<2.75.0') + if cc.get_id() == 'msvc' and get_option('default_library') != 'static' + # Override _GLIB_EXTERN on Visual Studio for media modules for glib <= 2.74.x, so that we + # avoid error C2375 (redefinition; different linkage) when building the g_io_module_*() bits + cdata.set('MODULES_OVERRIDE_GLIB_EXTERN', true) + endif + endif endif if os_unix giounix_dep = dependency('gio-unix-2.0', version: glib_req, required: false) |