Skip to content

Commit 9f34101

Browse files
Kostiantyn Kostiukbonzini
authored andcommitted
qga-vss: Use dynamic linking for GLib
The current GLib version implements the DllMain function. DllMain is also present in the provider.cpp code. So in the case of static linking, the DllMain redefinition error occurs. For now, just switch to dynamic linking and revert this patch when the issue will be solved. See Glib issue for more details https://gitlab.gnome.org/GNOME/glib/-/issues/692 Signed-off-by: Kostiantyn Kostiuk <[email protected]> Reviewed-by: Marc-André Lureau <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 2c933ac commit 9f34101

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

qga/vss-win32/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if add_languages('cpp', required: false)
2-
glib_static = dependency('glib-2.0', static: true)
2+
glib_dynamic = dependency('glib-2.0', static: false)
33
link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
44
'-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
55

@@ -8,7 +8,7 @@ if add_languages('cpp', required: false)
88
cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
99
link_args: link_args,
1010
vs_module_defs: 'qga-vss.def',
11-
dependencies: [glib_static, socket,
11+
dependencies: [glib_dynamic, socket,
1212
cc.find_library('ole32'),
1313
cc.find_library('oleaut32'),
1414
cc.find_library('shlwapi'),

0 commit comments

Comments
 (0)