From nobody Mon Apr 29 14:23:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490079951969431.9950588897884; Tue, 21 Mar 2017 00:05:51 -0700 (PDT) Received: from localhost ([::1]:36942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqDrZ-0001La-Kp for importer@patchew.org; Tue, 21 Mar 2017 03:05:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqDqm-0001LG-B9 for qemu-devel@nongnu.org; Tue, 21 Mar 2017 03:05:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqDqj-0006rO-75 for qemu-devel@nongnu.org; Tue, 21 Mar 2017 03:05:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqDqj-0006qm-15 for qemu-devel@nongnu.org; Tue, 21 Mar 2017 03:04:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E04B765D01 for ; Tue, 21 Mar 2017 07:04:56 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-73.ams2.redhat.com [10.36.116.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id E35BA60461; Tue, 21 Mar 2017 07:04:54 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 932CE80BBE; Tue, 21 Mar 2017 08:04:52 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E04B765D01 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E04B765D01 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 21 Mar 2017 08:04:48 +0100 Message-Id: <1490079888-29029-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 21 Mar 2017 07:04:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] add opengl_cflags to QEMU_CFLAGS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" ... and drop OPENGL_CFLAGS from Makefiles. Signed-off-by: Gerd Hoffmann --- configure | 2 +- hw/display/Makefile.objs | 6 +----- ui/Makefile.objs | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 1e0d7a8..02e3b69 100755 --- a/configure +++ b/configure @@ -3449,6 +3449,7 @@ if test "$opengl" !=3D "no" ; then if test "$gtk" =3D "yes" && $pkg_config --exists "$gtkpackage >=3D 3.1= 6"; then gtk_gl=3D"yes" fi + QEMU_CFLAGS=3D"$QEMU_CFLAGS $opengl_cflags" else if test "$opengl" =3D "yes" ; then feature_not_found "opengl" "Please install opengl (mesa) devel pkgs:= $opengl_pkgs" @@ -5503,7 +5504,6 @@ fi =20 if test "$opengl" =3D "yes" ; then echo "CONFIG_OPENGL=3Dy" >> $config_host_mak - echo "OPENGL_CFLAGS=3D$opengl_cflags" >> $config_host_mak echo "OPENGL_LIBS=3D$opengl_libs" >> $config_host_mak if test "$opengl_dmabuf" =3D "yes" ; then echo "CONFIG_OPENGL_DMABUF=3Dy" >> $config_host_mak diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 3d02e8b..551c050 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -18,11 +18,7 @@ common-obj-$(CONFIG_FRAMEBUFFER) +=3D framebuffer.o common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-vgafb.o common-obj-$(CONFIG_ZAURUS) +=3D tc6393xb.o =20 -ifeq ($(CONFIG_MILKYMIST_TMU2),y) -common-obj-y +=3D milkymist-tmu2.o -milkymist-tmu2.o-cflags :=3D $(OPENGL_CFLAGS) -milkymist-tmu2.o-libs +=3D $(OPENGL_LIBS) -endif +common-obj-$(CONFIG_MILKYMIST_TMU2) +=3D milkymist-tmu2.o =20 obj-$(CONFIG_OMAP) +=3D omap_dss.o obj-$(CONFIG_OMAP) +=3D omap_lcdc.o diff --git a/ui/Makefile.objs b/ui/Makefile.objs index dc936f1..27566b3 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -41,11 +41,8 @@ endif endif =20 gtk.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) -gtk-egl.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS) -gtk-gl-area.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS) -shader.o-cflags +=3D $(OPENGL_CFLAGS) -console-gl.o-cflags +=3D $(OPENGL_CFLAGS) -egl-helpers.o-cflags +=3D $(OPENGL_CFLAGS) +gtk-egl.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) +gtk-gl-area.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) =20 gtk-egl.o-libs +=3D $(OPENGL_LIBS) shader.o-libs +=3D $(OPENGL_LIBS) --=20 1.8.3.1