From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 12/17] meson: don't require CONFIG_VTE for the GTK UI
Date: Thu, 27 Aug 2020 12:59:51 -0400 [thread overview]
Message-ID: <20200827165956.12925-13-pbonzini@redhat.com> (raw)
In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Prevously CONFIG_VTE was not required to build QEMU with GTK UI support as not
all platforms have VTE available (in particular Windows).
Remove this requirement from the meson build system to enable QEMU to be built
with GTK UI support for Windows once again.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
ui/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/meson.build b/ui/meson.build
index 393c9bcb53..962e776569 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -44,7 +44,7 @@ if config_host.has_key('CONFIG_CURSES')
ui_modules += {'curses' : curses_ss}
endif
-if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE')
+if config_host.has_key('CONFIG_GTK')
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
gtk_ss = ss.source_set()
--
2.26.2
next prev parent reply other threads:[~2020-08-27 17:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 16:59 [PULL 00/17] Meson fixes for 2020-08-27 Paolo Bonzini
2020-08-27 16:59 ` [PULL 01/17] trace: fix creation of systemtap files Paolo Bonzini
2020-08-27 16:59 ` [PULL 02/17] meson: Build qemu-nbd on macOS again Paolo Bonzini
2020-08-27 18:06 ` Thomas Huth
2020-08-27 20:00 ` Eric Blake
2020-08-27 20:46 ` Paolo Bonzini
2020-08-27 16:59 ` [PULL 03/17] meson: Don't make object files for dtrace on macOS Paolo Bonzini
2020-08-27 16:59 ` [PULL 04/17] scripts/qemu-version.sh: Add missing space before ']' Paolo Bonzini
2020-08-27 16:59 ` [PULL 05/17] meson: Fix meson build with --enable-libdaxctl Paolo Bonzini
2020-08-27 16:59 ` [PULL 06/17] meson: Fix chardev-baum.so name Paolo Bonzini
2020-08-27 16:59 ` [PULL 07/17] configure: default to PIE disabled on Windows platforms Paolo Bonzini
2020-08-27 16:59 ` [PULL 08/17] meson: move pixman detection to meson Paolo Bonzini
2020-08-27 16:59 ` [PULL 09/17] meson: skip SDL2 detection if --disable-system Paolo Bonzini
2020-08-27 16:59 ` [PULL 10/17] configure: add --ninja option Paolo Bonzini
2020-08-27 16:59 ` [PULL 11/17] meson: cleanup xkbcommon detection Paolo Bonzini
2020-08-27 16:59 ` Paolo Bonzini [this message]
2020-08-27 16:59 ` [PULL 13/17] ninjatool: quote dollars in variables Paolo Bonzini
2020-08-27 16:59 ` [PULL 14/17] meson: fix relpath failure on Win32 Paolo Bonzini
2020-08-27 16:59 ` [PULL 15/17] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Paolo Bonzini
2020-08-27 16:59 ` [PULL 16/17] meson: set colorout to auto Paolo Bonzini
2020-08-27 16:59 ` [PULL 17/17] ninjatool: Fixes E$$: in generated Makefile.ninja Paolo Bonzini
2020-08-28 10:04 ` [PULL 00/17] Meson fixes for 2020-08-27 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200827165956.12925-13-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=kraxel@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).