[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/30] qga/vss-win32: use widl if available
From: |
Paolo Bonzini |
Subject: |
[PULL 23/30] qga/vss-win32: use widl if available |
Date: |
Tue, 15 Feb 2022 10:32:16 +0100 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
widl from mingw64-tools and wine can compile a TLB file.
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>
---
qga/vss-win32/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 78bdf5e74a..8f3aff5fe3 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -18,15 +18,18 @@ if add_languages('cpp', required: false)
all_qga += qga_vss
endif
-# rules to build qga-vss.tlb
-# Currently, only native build is supported because building .tlb
-# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in VC++).
midl = find_program('midl', required: false)
+widl = find_program('widl', required: false)
if midl.found()
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.idl',
output: 'qga-vss.tlb',
command: [midl, '@INPUT@', '/tlb', '@OUTPUT@'])
+elif widl.found()
+ gen_tlb = custom_target('gen-tlb',
+ input: 'qga-vss.idl',
+ output: 'qga-vss.tlb',
+ command: [widl, '-t', '@INPUT@', '-o', '@OUTPUT@'])
else
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.tlb',
--
2.34.1
- [PULL 16/30] configure, meson: move coroutine options to meson_options.txt, (continued)
- [PULL 16/30] configure, meson: move coroutine options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 21/30] qga/vss-win32: fix midl arguments, Paolo Bonzini, 2022/02/15
- [PULL 20/30] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/02/15
- [PULL 17/30] configure, meson: move smbd options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 18/30] configure, meson: move guest-agent, tools to meson, Paolo Bonzini, 2022/02/15
- [PULL 22/30] meson: drop --with-win-sdk, Paolo Bonzini, 2022/02/15
- [PULL 25/30] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk, Paolo Bonzini, 2022/02/15
- [PULL 28/30] meson: require dynamic linking for VSS support, Paolo Bonzini, 2022/02/15
- [PULL 27/30] qga/vss-win32: require widl/midl, remove pre-built TLB file, Paolo Bonzini, 2022/02/15
- [PULL 19/30] meson: refine check for whether to look for virglrenderer, Paolo Bonzini, 2022/02/15
- [PULL 23/30] qga/vss-win32: use widl if available,
Paolo Bonzini <=
- [PULL 24/30] qga/vss: use standard windows headers location, Paolo Bonzini, 2022/02/15
- [PULL 26/30] meson: do not make qga/vss-win32/meson.build conditional on C++ presence, Paolo Bonzini, 2022/02/15
- [PULL 30/30] configure, meson: move CONFIG_IASL to a Meson option, Paolo Bonzini, 2022/02/15
- [PULL 29/30] meson, configure: move ntddscsi API check to meson, Paolo Bonzini, 2022/02/15
- Re: [PULL 00/30] Misc mostly build system patches for 2022-02-15, Peter Maydell, 2022/02/16