motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-18 23:52:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: do not make qga/vss-win32/meson.build conditional on C++ presence

Browse source 
C++ presence is checked by the qga/ directory, so it can be assumed
when building VSS module.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-02-02 00:23:33 +04:00 • committed by Paolo Bonzini
parent 8821a389b1
commit 1e1223249d
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
qga/vss-win32/meson.build
View file

@ -1,22 +1,29 @@
if add_languages('cpp', required: false) glib_dynamic = dependency('glib-2.0', static: false)
glib_dynamic = dependency('glib-2.0', static: false) link_args = cc.get_supported_link_arguments([
link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong', '-fstack-protector-all',
'-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup']) '-fstack-protector-strong',
'-Wl,--add-stdcall-alias',
'-Wl,--enable-stdcall-fixup'
])
qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'], qga_vss = shared_module(
name_prefix: '', 'qga-vss',
cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'], ['requester.cpp', 'provider.cpp', 'install.cpp'],
link_args: link_args, name_prefix: '',
vs_module_defs: 'qga-vss.def', cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
dependencies: [glib_dynamic, socket, link_args: link_args,
cc.find_library('ole32'), vs_module_defs: 'qga-vss.def',
cc.find_library('oleaut32'), dependencies: [
cc.find_library('shlwapi'), glib_dynamic, socket,
cc.find_library('uuid'), cc.find_library('ole32'),
cc.find_library('intl')]) cc.find_library('oleaut32'),
cc.find_library('shlwapi'),
cc.find_library('uuid'),
cc.find_library('intl')
]
)
all_qga += qga_vss all_qga += qga_vss
endif
midl = find_program('midl', required: false) midl = find_program('midl', required: false)
widl = find_program('widl', required: false) widl = find_program('widl', required: false)