[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags to per object
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags to per object |
Date: |
Fri, 8 Sep 2017 17:55:01 +0800 |
Opengl libs are already moved to per object, do so for the cflags as
well.
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
configure | 2 +-
ui/Makefile.objs | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index df22b14259..385ed51a18 100755
--- a/configure
+++ b/configure
@@ -3627,7 +3627,6 @@ if test "$opengl" != "no" ; then
if test "$gtk" = "yes" && $pkg_config --exists "$gtkpackage >= 3.16"; then
gtk_gl="yes"
fi
- QEMU_CFLAGS="$QEMU_CFLAGS $opengl_cflags"
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl" "Please install opengl (mesa) devel pkgs:
$opengl_pkgs"
@@ -5843,6 +5842,7 @@ fi
if test "$opengl" = "yes" ; then
echo "CONFIG_OPENGL=y" >> $config_host_mak
+ echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak
echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
if test "$opengl_dmabuf" = "yes" ; then
echo "CONFIG_OPENGL_DMABUF=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index e3403b698b..95943d9c33 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -53,10 +53,10 @@ gtk.o-libs := $(GTK_LIBS) $(VTE_LIBS)
gtk-egl.o-libs := $(GTK_LIBS) $(VTE_LIBS)
gtk-gl-area.o-libs := $(GTK_LIBS) $(VTE_LIBS)
-gtk-egl.o-libs += $(OPENGL_LIBS)
-shader.o-libs += $(OPENGL_LIBS)
-console-gl.o-libs += $(OPENGL_LIBS)
-egl-helpers.o-libs += $(OPENGL_LIBS)
+$(foreach x, gtk-egl shader console egl-helpers, \
+ $(eval $x.o-libs += $(OPENGL_LIBS)) \
+ $(eval $x.o-cflags += $(OPENGL_CFLAGS)) \
+)
curses.o-cflags := $(CURSES_CFLAGS)
curses.o-libs := $(CURSES_LIBS)
--
2.13.5
- [Qemu-devel] [PULL 23/38] docker: Add nettle-devel to fedora image, (continued)
- [Qemu-devel] [PULL 23/38] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 24/38] docker: Add test-block, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 25/38] docker: Drop 'set -e' from run script, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 26/38] vl: Don't include vde header, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 27/38] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 29/38] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 30/38] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 31/38] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 34/38] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 35/38] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 37/38] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 36/38] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 38/38] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, no-reply, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, Peter Maydell, 2017/09/08