From 9f34101db00eabd8f424e98b481c2394e6509198 Mon Sep 17 00:00:00 2001 From: Kostiantyn Kostiuk Date: Mon, 1 Mar 2021 13:16:07 +0100 Subject: qga-vss: Use dynamic linking for GLib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- qga/vss-win32/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qga') diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build index 780c461..90825ed 100644 --- a/qga/vss-win32/meson.build +++ b/qga/vss-win32/meson.build @@ -1,5 +1,5 @@ if add_languages('cpp', required: false) - glib_static = dependency('glib-2.0', static: true) + glib_dynamic = dependency('glib-2.0', static: false) link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong', '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup']) @@ -8,7 +8,7 @@ if add_languages('cpp', required: false) cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'], link_args: link_args, vs_module_defs: 'qga-vss.def', - dependencies: [glib_static, socket, + dependencies: [glib_dynamic, socket, cc.find_library('ole32'), cc.find_library('oleaut32'), cc.find_library('shlwapi'), -- cgit v1.1