Commit cc720a5d authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Peter Maydell
Browse files

add opengl_cflags to QEMU_CFLAGS 



... and drop OPENGL_CFLAGS from Makefiles.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 1490079888-29029-1-git-send-email-kraxel@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 940a8ce0

configure

+1 −1
Original line number Diff line number Diff line
@@ -3449,6 +3449,7 @@ 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"
@@ -5503,7 +5504,6 @@ 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

hw/display/Makefile.objs

+1 −5
Original line number Diff line number Diff line
@@ -18,11 +18,7 @@ common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o 
common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o

common-obj-$(CONFIG_ZAURUS) += tc6393xb.o



ifeq ($(CONFIG_MILKYMIST_TMU2),y)

common-obj-y += milkymist-tmu2.o

milkymist-tmu2.o-cflags := $(OPENGL_CFLAGS)

milkymist-tmu2.o-libs += $(OPENGL_LIBS)

endif

common-obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o



obj-$(CONFIG_OMAP) += omap_dss.o

obj-$(CONFIG_OMAP) += omap_lcdc.o

ui/Makefile.objs

+2 −5
Original line number Diff line number Diff line
@@ -41,11 +41,8 @@ endif 
endif



gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)

gtk-egl.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS)

gtk-gl-area.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS)

shader.o-cflags += $(OPENGL_CFLAGS)

console-gl.o-cflags += $(OPENGL_CFLAGS)

egl-helpers.o-cflags += $(OPENGL_CFLAGS)

gtk-egl.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)

gtk-gl-area.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)



gtk-egl.o-libs += $(OPENGL_LIBS)

shader.o-libs += $(OPENGL_LIBS)