[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/8] ui/gtk: group gtk.mo declarations in Makefile
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/8] ui/gtk: group gtk.mo declarations in Makefile |
Date: |
Thu, 8 Mar 2018 09:32:27 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 0/8] Ui 20180308 patches, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 8/8] ui/gtk-egl: add cursor_dmabuf support, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 4/8] ui/gtk: group gtk.mo declarations in Makefile,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 2/8] sdl: workaround bug in sdl 2.0.8 headers, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 1/8] make: switch language file build to be gtk module aware, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 6/8] ui/gtk: use GtkGlArea on wayland only, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 7/8] ui/gtk-egl: add scanout_dmabuf support, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 3/8] ui/gtk: make GtkGlArea usage a runtime option, Gerd Hoffmann, 2018/03/08
- [Qemu-devel] [PULL 5/8] ui/opengl: Makefile cleanup, Gerd Hoffmann, 2018/03/08
- Re: [Qemu-devel] [PULL 0/8] Ui 20180308 patches, Peter Maydell, 2018/03/08