From patchwork Mon Aug 3 12:46:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 47EE6B6F31 for ; Tue, 4 Aug 2009 00:11:07 +1000 (EST) Received: from localhost ([127.0.0.1]:38179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXyFk-0007Gb-7Q for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:11:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzM-0003U9-ER for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzH-0003Qr-ON for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:04 -0400 Received: from [199.232.76.173] (port=51690 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzH-0003Qg-IT for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40826) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzG-00073b-SG for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:59 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73CnwXL006630; Mon, 3 Aug 2009 08:49:58 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CnvdL026149; Mon, 3 Aug 2009 08:49:57 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8Mh009715; Mon, 3 Aug 2009 08:49:56 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:30 +0200 Message-Id: <7db1ecfa8b5492cc88e15ad3fa1a96b1c3e421ba.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 39/81] Move sound library selection to sound selection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile.target | 18 ------------------ configure | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Makefile.target b/Makefile.target index 75861f7..04963c3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -227,24 +227,6 @@ obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o LIBS+=-lz -ifdef CONFIG_ALSA -LIBS += -lasound -endif -ifdef CONFIG_ESD -LIBS += -lesd -endif -ifdef CONFIG_PA -LIBS += -lpulse-simple -endif -ifdef CONFIG_DSOUND -LIBS += -lole32 -ldxguid -endif -ifdef CONFIG_FMOD -LIBS += $(FMOD_LIBS) -endif -ifdef CONFIG_OSS -LIBS += $(OSS_LIBS) -endif sound-obj-y = sound-obj-$(CONFIG_SB16) += sb16.o diff --git a/configure b/configure index 738bef8..3b37d97 100755 --- a/configure +++ b/configure @@ -993,6 +993,7 @@ for drv in $audio_drv_list; do alsa) audio_drv_probe $drv alsa/asoundlib.h -lasound \ "snd_pcm_t **handle; return snd_pcm_close(*handle);" + libs_softmmu="-lasound $libs_softmmu" ;; fmod) @@ -1004,22 +1005,33 @@ for drv in $audio_drv_list; do exit 1 fi audio_drv_probe $drv fmod.h $fmod_lib "return FSOUND_GetVersion();" "-I $fmod_inc" + libs_softmmu="$fmod_lib $libs_softmmu" ;; esd) audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);' + libs_softmmu="-lesd $libs_softmmu" ;; pa) audio_drv_probe $drv pulse/simple.h -lpulse-simple \ "pa_simple *s = NULL; pa_simple_free(s); return 0;" + libs_softmmu="-lpulse-simple $libs_softmmu" ;; coreaudio) libs_softmmu="-framework CoreAudio $libs_softmmu" ;; - oss|sdl|wav|dsound) + dsound) + libs_softmmu="-lole32 -ldxguid $libs_softmmu" + ;; + + oss) + libs_softmmu="$oss_lib $libs_softmmu" + ;; + + sdl|wav) # XXX: Probes for CoreAudio, DirectSound, SDL(?) ;; @@ -1602,10 +1614,7 @@ for drv in $audio_drv_list; do def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'` echo "$def=y" >> $config_host_mak if test "$drv" = "fmod"; then - echo "FMOD_LIBS=$fmod_lib" >> $config_host_mak echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak - elif test "$drv" = "oss"; then - echo "OSS_LIBS=$oss_lib" >> $config_host_mak fi done if test "$mixemu" = "yes" ; then