From nobody Mon Feb 9 16:19:24 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 1504773303367912.625523619698; Thu, 7 Sep 2017 01:35:03 -0700 (PDT) Received: from localhost ([::1]:39297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpsH8-0002I9-AI for importer@patchew.org; Thu, 07 Sep 2017 04:35:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpsBx-00070T-7O for qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:29:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpsBs-0001mx-Iq for qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:29:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpsBs-0001mn-Cl for qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:29:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B5DD4E4F3 for ; Thu, 7 Sep 2017 08:29:35 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-63.pek2.redhat.com [10.72.12.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 104A55D6A3; Thu, 7 Sep 2017 08:29:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7B5DD4E4F3 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=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 16:29:13 +0800 Message-Id: <20170907082918.7299-5-famz@redhat.com> In-Reply-To: <20170907082918.7299-1-famz@redhat.com> References: <20170907082918.7299-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 07 Sep 2017 08:29:35 +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 4/9] buildsys: Move audio libs 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: 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" Signed-off-by: Fam Zheng --- audio/Makefile.objs | 5 +++++ configure | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/audio/Makefile.objs b/audio/Makefile.objs index c20695668f..8a5ede6e2b 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -12,3 +12,8 @@ common-obj-y +=3D wavcapture.o =20 sdlaudio.o-cflags :=3D $(SDL_CFLAGS) sdlaudio.o-libs :=3D $(SDL_LIBS) +alsaaudio.o-libs :=3D $(ALSA_LIBS) +paaudio.o-libs :=3D $(PULSE_LIBS) +coreaudio.o-libs :=3D $(COREAUDIO_LIBS) +dsoundaudio.o-libs :=3D $(DSOUND_LIBS) +ossaudio.o-libs :=3D $(OSS_LIBS) diff --git a/configure b/configure index 9b0eb91a9b..71fa9717ff 100755 --- a/configure +++ b/configure @@ -3040,13 +3040,13 @@ for drv in $audio_drv_list; do alsa) audio_drv_probe $drv alsa/asoundlib.h -lasound \ "return snd_pcm_close((snd_pcm_t *)0);" - libs_softmmu=3D"-lasound $libs_softmmu" + alsa_libs=3D"-lasound" ;; =20 pa) audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); r= eturn 0;" - libs_softmmu=3D"-lpulse $libs_softmmu" + pulse_libs=3D"-lpulse" audio_pt_int=3D"yes" ;; =20 @@ -3057,16 +3057,16 @@ for drv in $audio_drv_list; do ;; =20 coreaudio) - libs_softmmu=3D"-framework CoreAudio $libs_softmmu" + coreaudio_libs=3D"-framework CoreAudio" ;; =20 dsound) - libs_softmmu=3D"-lole32 -ldxguid $libs_softmmu" + dsound_libs=3D"-lole32 -ldxguid" audio_win_int=3D"yes" ;; =20 oss) - libs_softmmu=3D"$oss_lib $libs_softmmu" + oss_libs=3D"$oss_lib" ;; =20 wav) @@ -5548,6 +5548,11 @@ for drv in $audio_drv_list; do def=3DCONFIG_$(echo $drv | LC_ALL=3DC tr '[a-z]' '[A-Z]') echo "$def=3Dy" >> $config_host_mak done +echo "ALSA_LIBS=3D$alsa_libs" >> $config_host_mak +echo "PULSE_LIBS=3D$pulse_libs" >> $config_host_mak +echo "COREAUDIO_LIBS=3D$coreaudio_libs" >> $config_host_mak +echo "DSOUND_LIBS=3D$dsound_libs" >> $config_host_mak +echo "OSS_LIBS=3D$oss_libs" >> $config_host_mak if test "$audio_pt_int" =3D "yes" ; then echo "CONFIG_AUDIO_PT_INT=3Dy" >> $config_host_mak fi --=20 2.13.5