diff options
| author | Paolo Bonzini | 2021-10-15 16:28:29 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-02-21 10:35:53 +0100 |
| commit | 87263685936623f3229ead1ca17f9fe8f7ae4baa (patch) | |
| tree | ae2f7200552964ff0f116b75b9d317bf16764255 /qga | |
| parent | configure, meson: move TPM check to meson (diff) | |
| download | qemu-87263685936623f3229ead1ca17f9fe8f7ae4baa.tar.gz qemu-87263685936623f3229ead1ca17f9fe8f7ae4baa.tar.xz qemu-87263685936623f3229ead1ca17f9fe8f7ae4baa.zip | |
configure, meson: cleanup qemu-ga libraries
Move LIBS_QGA to meson.build, remove dead QGA_VSS_PROVIDER variable.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/meson.build | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/qga/meson.build b/qga/meson.build index 1ee9dca60b..56fb6539e5 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -1,3 +1,5 @@ +all_qga = [] + qga_qapi_outputs = [ 'qga-qapi-commands.c', 'qga-qapi-commands.h', @@ -50,19 +52,26 @@ qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 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'] |