[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/24] meson: add pixman dependency to UI modules
From: |
Paolo Bonzini |
Subject: |
[PULL 20/24] meson: add pixman dependency to UI modules |
Date: |
Tue, 1 Sep 2020 05:11:28 -0400 |
Pixman used to be included directly in QEMU_CFLAGS and therefore the
include path was added to every compiler invocation. Now that (just
like basically everything else) it is a separate dependency, we
need to add it to all build target, especially UI modules that need
it due to their including ui/console.h.
Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
ui/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/meson.build b/ui/meson.build
index aa8aa31516..82f60756d9 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -40,7 +40,7 @@ ui_modules = {}
if config_host.has_key('CONFIG_CURSES')
curses_ss = ss.source_set()
- curses_ss.add(when: [curses, iconv], if_true: files('curses.c'))
+ curses_ss.add(when: [curses, iconv], if_true: [files('curses.c'), pixman])
ui_modules += {'curses' : curses_ss}
endif
@@ -48,7 +48,7 @@ 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()
- gtk_ss.add(gtk, vte, files('gtk.c'))
+ gtk_ss.add(gtk, vte, pixman, files('gtk.c'))
gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c'))
gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c'))
gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.c'))
@@ -71,7 +71,7 @@ endif
if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO')
spice_ss = ss.source_set()
- spice_ss.add(spice, gio, files('spice-app.c'))
+ spice_ss.add(spice, gio, pixman, files('spice-app.c'))
ui_modules += {'spice-app': spice_ss}
endif
--
2.26.2
- [PULL 10/24] meson: move zlib detection to meson, (continued)
- [PULL 10/24] meson: move zlib detection to meson, Paolo Bonzini, 2020/09/01
- [PULL 12/24] configure: always /-seperate directory from qemu_suffix, Paolo Bonzini, 2020/09/01
- [PULL 14/24] meson: pass qemu_suffix option, Paolo Bonzini, 2020/09/01
- [PULL 13/24] configure: build docdir like other suffixed directories, Paolo Bonzini, 2020/09/01
- [PULL 17/24] meson: use meson mandir instead of qemu_mandir, Paolo Bonzini, 2020/09/01
- [PULL 16/24] meson: pass docdir option, Paolo Bonzini, 2020/09/01
- [PULL 19/24] meson: add pixman dependency to chardev/baum module, Paolo Bonzini, 2020/09/01
- [PULL 21/24] configure: do not include ${prefix} in firmwarepath, Paolo Bonzini, 2020/09/01
- [PULL 24/24] meson: add description to options, Paolo Bonzini, 2020/09/01
- [PULL 20/24] meson: add pixman dependency to UI modules,
Paolo Bonzini <=
- [PULL 22/24] meson: use pkg-config method to find dependencies, Paolo Bonzini, 2020/09/01
- [PULL 15/24] meson: use meson datadir instead of qemu_datadir, Paolo Bonzini, 2020/09/01
- [PULL 23/24] build: fix recurse-all target, Paolo Bonzini, 2020/09/01
- [PULL 18/24] meson: add NSIS building, Paolo Bonzini, 2020/09/01
- Re: [PULL 00/24] Meson changes for 2020-09-01, Peter Maydell, 2020/09/01
- Re: [PULL 00/24] Meson changes for 2020-09-01, Yonggang Luo, 2020/09/01