[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/14] ui/opengl: Makefile cleanup
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 06/14] ui/opengl: Makefile cleanup |
Date: |
Mon, 12 Mar 2018 10:13:57 +0100 |
With gtk.mo bits moved away we don't need the ifeq any more.
Also add missing opengl libs for some objects.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
ui/Makefile.objs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index b560ee12c3..cc784346cb 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -51,14 +51,14 @@ curses.mo-objs := curses.o
curses.mo-cflags := $(CURSES_CFLAGS)
curses.mo-libs := $(CURSES_LIBS)
-ifeq ($(CONFIG_OPENGL),y)
-common-obj-y += shader.o
-common-obj-y += console-gl.o
-common-obj-y += egl-helpers.o
-common-obj-y += egl-context.o
+common-obj-$(CONFIG_OPENGL) += shader.o
+common-obj-$(CONFIG_OPENGL) += console-gl.o
+common-obj-$(CONFIG_OPENGL) += egl-helpers.o
+common-obj-$(CONFIG_OPENGL) += egl-context.o
common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
-endif
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS)
+egl-context.o-libs += $(OPENGL_LIBS)
+egl-headless.o-libs += $(OPENGL_LIBS)
--
2.9.3
- [Qemu-devel] [PULL 00/14] Ui 20180312 patches, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 02/14] make: switch language file build to be gtk module aware, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 03/14] sdl: workaround bug in sdl 2.0.8 headers, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 01/14] build: try improve handling of clang warnings, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 09/14] ui/gtk-egl: add cursor_dmabuf support, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 10/14] vnc: deal with surface NULL pointers, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 07/14] ui/gtk: use GtkGlArea on wayland only, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 05/14] ui/gtk: group gtk.mo declarations in Makefile, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 14/14] qapi: Add device ID and head parameters to screendump, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 06/14] ui/opengl: Makefile cleanup,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 08/14] ui/gtk-egl: add scanout_dmabuf support, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 11/14] spice: drop dprint() debug logging, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 12/14] spice: add scanout_dmabuf support, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 04/14] ui/gtk: make GtkGlArea usage a runtime option, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 13/14] spice: add cursor_dmabuf support, Gerd Hoffmann, 2018/03/12
- Re: [Qemu-devel] [PULL 00/14] Ui 20180312 patches, Peter Maydell, 2018/03/12