From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v2 2/6] ui/gtk: group gtk.mo declarations in Makefile
Date: Tue, 6 Mar 2018 10:09:47 +0100 [thread overview]
Message-ID: <20180306090951.22932-3-kraxel@redhat.com> (raw)
In-Reply-To: <20180306090951.22932-1-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/Makefile.objs | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index d1203bb80a..b560ee12c3 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -38,6 +38,13 @@ common-obj-$(CONFIG_GTK) += gtk.mo
gtk.mo-objs := gtk.o
gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS)
+ifeq ($(CONFIG_OPENGL),y)
+gtk.mo-objs += gtk-egl.o
+gtk.mo-libs += $(OPENGL_LIBS)
+ifeq ($(CONFIG_GTK_GL),y)
+gtk.mo-objs += gtk-gl-area.o
+endif
+endif
common-obj-$(CONFIG_CURSES) += curses.mo
curses.mo-objs := curses.o
@@ -50,11 +57,6 @@ common-obj-y += console-gl.o
common-obj-y += egl-helpers.o
common-obj-y += egl-context.o
common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
-ifeq ($(CONFIG_GTK_GL),y)
-gtk.mo-objs += gtk-gl-area.o
-endif
-gtk.mo-objs += gtk-egl.o
-gtk.mo-libs += $(OPENGL_LIBS)
endif
shader.o-libs += $(OPENGL_LIBS)
--
2.9.3
next prev parent reply other threads:[~2018-03-06 9:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 9:09 [Qemu-devel] [PATCH v2 0/6] gtk: add support for dmabufs Gerd Hoffmann
2018-03-06 9:09 ` [Qemu-devel] [PATCH v2 1/6] ui/gtk: make GtkGlArea usage a runtime option Gerd Hoffmann
2018-03-06 9:09 ` Gerd Hoffmann [this message]
2018-03-06 9:09 ` [Qemu-devel] [PATCH v2 3/6] ui/opengl: Makefile cleanup Gerd Hoffmann
2018-03-06 9:09 ` [Qemu-devel] [PATCH v2 4/6] ui/gtk: use GtkGlArea on wayland only Gerd Hoffmann
2018-03-06 9:09 ` [Qemu-devel] [PATCH v2 5/6] ui/gtk-egl: add scanout_dmabuf support Gerd Hoffmann
2018-03-06 9:09 ` [Qemu-devel] [PATCH v2 6/6] ui/gtk-egl: add cursor_dmabuf support Gerd Hoffmann
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=20180306090951.22932-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--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).