From nobody Tue Feb 10 07:01:38 2026 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.zohomail.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 1504866215039899.3149042132862; Fri, 8 Sep 2017 03:23:35 -0700 (PDT) Received: from localhost ([::1]:44363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqGRh-0007o3-OW for importer@patchew.org; Fri, 08 Sep 2017 06:23:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqG1M-0008VR-3J for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqG1H-00059p-Fy for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49014) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqG1H-000591-9i for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41B9BBDE3; Fri, 8 Sep 2017 09:56:14 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-98.pek2.redhat.com [10.72.12.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7CF160E3A; Fri, 8 Sep 2017 09:56:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 41B9BBDE3 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 8 Sep 2017 17:55:01 +0800 Message-Id: <20170908095506.13594-34-famz@redhat.com> In-Reply-To: <20170908095506.13594-1-famz@redhat.com> References: <20170908095506.13594-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 08 Sep 2017 09:56:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 33/38] buildsys: Move opengl cflags to per object 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Opengl libs are already moved to per object, do so for the cflags as well. Signed-off-by: Fam Zheng Message-Id: <20170907082918.7299-7-famz@redhat.com> Reviewed-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Fam Zheng --- 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" !=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" @@ -5843,6 +5842,7 @@ 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/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 :=3D $(GTK_LIBS) $(VTE_LIBS) gtk-egl.o-libs :=3D $(GTK_LIBS) $(VTE_LIBS) gtk-gl-area.o-libs :=3D $(GTK_LIBS) $(VTE_LIBS) =20 -gtk-egl.o-libs +=3D $(OPENGL_LIBS) -shader.o-libs +=3D $(OPENGL_LIBS) -console-gl.o-libs +=3D $(OPENGL_LIBS) -egl-helpers.o-libs +=3D $(OPENGL_LIBS) +$(foreach x, gtk-egl shader console egl-helpers, \ + $(eval $x.o-libs +=3D $(OPENGL_LIBS)) \ + $(eval $x.o-cflags +=3D $(OPENGL_CFLAGS)) \ +) =20 curses.o-cflags :=3D $(CURSES_CFLAGS) curses.o-libs :=3D $(CURSES_LIBS) --=20 2.13.5