[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/24] meson: Allow to enable gtk and sdl while cocoa is enabled
From: |
Gerd Hoffmann |
Subject: |
[PULL 04/24] meson: Allow to enable gtk and sdl while cocoa is enabled |
Date: |
Tue, 27 Sep 2022 10:18:52 +0200 |
From: Akihiko Odaki <akihiko.odaki@gmail.com>
As ui/cocoa does no longer override main(), ui/gtk and ui/sdl
can be enabled even ui/cocoa is enabled.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220819132756.74641-4-akihiko.odaki@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
meson.build | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index 3885fc107633..d9ac91ff3659 100644
--- a/meson.build
+++ b/meson.build
@@ -589,12 +589,6 @@ endif
cocoa = dependency('appleframeworks', modules: ['Cocoa', 'CoreVideo'],
required: get_option('cocoa'))
-if cocoa.found() and get_option('sdl').enabled()
- error('Cocoa and SDL cannot be enabled at the same time')
-endif
-if cocoa.found() and get_option('gtk').enabled()
- error('Cocoa and GTK+ cannot be enabled at the same time')
-endif
vmnet = dependency('appleframeworks', modules: 'vmnet', required:
get_option('vmnet'))
if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h',
@@ -921,7 +915,7 @@ if not get_option('brlapi').auto() or have_system
endif
sdl = not_found
-if not get_option('sdl').auto() or (have_system and not cocoa.found())
+if not get_option('sdl').auto() or have_system
sdl = dependency('sdl2', required: get_option('sdl'), kwargs: static_kwargs)
sdl_image = not_found
endif
@@ -1187,7 +1181,7 @@ endif
gtk = not_found
gtkx11 = not_found
vte = not_found
-if not get_option('gtk').auto() or (have_system and not cocoa.found())
+if not get_option('gtk').auto() or have_system
gtk = dependency('gtk+-3.0', version: '>=3.22.0',
method: 'pkg-config',
required: get_option('gtk'),
--
2.37.3
- [PULL 01/24] ui/console: Get tab completion working again in the SDL monitor vc, (continued)
- [PULL 01/24] ui/console: Get tab completion working again in the SDL monitor vc, Gerd Hoffmann, 2022/09/27
- [PULL 08/24] ui/clipboard: reset the serial state on reset, Gerd Hoffmann, 2022/09/27
- [PULL 07/24] ui/vdagent: always reset the clipboard serial on caps, Gerd Hoffmann, 2022/09/27
- [PULL 05/24] ui: add some vdagent related traces, Gerd Hoffmann, 2022/09/27
- [PULL 10/24] ui/console: fix three double frees in png_save(), Gerd Hoffmann, 2022/09/27
- [PULL 09/24] ui/vdagent: fix serial reset of guest agent, Gerd Hoffmann, 2022/09/27
- [PULL 03/24] Revert "main-loop: Disable block backend global state assertion on Cocoa", Gerd Hoffmann, 2022/09/27
- [PULL 02/24] ui/cocoa: Run qemu_init in the main thread, Gerd Hoffmann, 2022/09/27
- [PULL 06/24] ui/clipboard: fix serial priority, Gerd Hoffmann, 2022/09/27
- [PULL 11/24] hw/usb/hcd-xhci: Check whether DMA accesses fail, Gerd Hoffmann, 2022/09/27
- [PULL 04/24] meson: Allow to enable gtk and sdl while cocoa is enabled,
Gerd Hoffmann <=
- [PULL 16/24] usbnet: Add missing usb_wakeup() call in usbnet_receive(), Gerd Hoffmann, 2022/09/27
- [PULL 14/24] usb/msd: add usb_msd_fatal_error() and fix guest-triggerable assert, Gerd Hoffmann, 2022/09/27
- [PULL 15/24] hcd-xhci: drop operation with secondary stream arrays enabled, Gerd Hoffmann, 2022/09/27
- [PULL 12/24] hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero, Gerd Hoffmann, 2022/09/27
- [PULL 13/24] usb/msd: move usb_msd_packet_complete(), Gerd Hoffmann, 2022/09/27
- [PULL 19/24] usbnet: Report link-up via interrupt endpoint in CDC-ECM mode, Gerd Hoffmann, 2022/09/27
- [PULL 18/24] usbnet: Detect short packets as sent by the xHCI controller, Gerd Hoffmann, 2022/09/27
- [PULL 17/24] usbnet: Accept mandatory USB_CDC_SET_ETHERNET_PACKET_FILTER request, Gerd Hoffmann, 2022/09/27
- [PULL 24/24] virtio-gpu: update scanout if there is any area covered by the rect, Gerd Hoffmann, 2022/09/27
- [PULL 21/24] Revert "audio: Log context for audio bug", Gerd Hoffmann, 2022/09/27