ping On Wed, Feb 17, 2021 at 2:54 PM Konstantin Kostiuk <[email protected]> wrote:
> ping > > On Tue, Feb 9, 2021 at 4:54 PM Kostiantyn Kostiuk <[email protected]> > wrote: > >> 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]> >> --- >> qga/vss-win32/meson.build | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build >> index 780c461432..90825edef3 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'), >> -- >> 2.25.1 >> >>
