Move LIBS_QGA to meson.build, remove dead QGA_VSS_PROVIDER variable.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
block_drv_ro_whitelist=""
block_drv_whitelist_tools="no"
host_cc="cc"
-libs_qga=""
debug_info="yes"
lto="false"
stack_protector=""
write_c_skeleton;
prefix="/qemu"
qemu_suffix=""
- libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga"
fi
werror=""
if compile_prog "$vss_win32_include" "" ; then
guest_agent_with_vss="yes"
QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
- libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
- qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
else
if test "$vss_win32_sdk" != "" ; then
echo "ERROR: Please download and install Microsoft VSS SDK:"
EOF
if compile_prog "" "" ; then
guest_agent_ntddscsi=yes
- libs_qga="-lsetupapi -lcfgmgr32 $libs_qga"
fi
fi
echo "CONFIG_WIN32=y" >> $config_host_mak
if test "$guest_agent_with_vss" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak
- echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak
echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
fi
if test "$guest_agent_ntddscsi" = "yes" ; then
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
echo "STRIP=$strip" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
-echo "LIBS_QGA=$libs_qga" >> $config_host_mak
if test "$rng_none" = "yes"; then
echo "CONFIG_RNG_NONE=y" >> $config_host_mak
+all_qga = []
+
qga_qapi_outputs = [
'qga-qapi-commands.c',
'qga-qapi-commands.h',
qga_ss = qga_ss.apply(config_host, strict: false)
-qga = executable('qemu-ga', qga_ss.sources(),
- link_args: config_host['LIBS_QGA'].split(),
- dependencies: [qemuutil, libudev],
- install: true)
-all_qga = [qga]
-
+gen_tlb = []
+qga_libs = []
if targetos == 'windows'
+ qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32']
if 'CONFIG_QGA_VSS' in config_host
+ qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup']
subdir('vss-win32')
- else
- gen_tlb = []
endif
+ if 'CONFIG_QGA_NTDDSCSI' in config_host
+ qga_libs += ['-lsetupapi', '-lcfgmgr32']
+ endif
+endif
+
+qga = executable('qemu-ga', qga_ss.sources(),
+ link_args: qga_libs,
+ dependencies: [qemuutil, libudev],
+ install: true)
+all_qga += qga
+if targetos == 'windows'
qemu_ga_msi_arch = {
'x86': ['-D', 'Arch=32'],
'x86_64': ['-a', 'x64', '-D', 'Arch=64']