Opengl libs are already moved to per object, do so for the cflags as
well.
Signed-off-by: Fam Zheng <f...@redhat.com>
---
configure | 2 +-
ui/Makefile.objs | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index b08cb4ce02..b1320b1994 100755
--- a/configure
+++ b/configure
@@ -3623,7 +3623,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"
@@ -5844,6 +5843,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
