From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KWETD-0004Vj-Pd for qemu-devel@nongnu.org; Thu, 21 Aug 2008 14:01:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KWETD-0004VX-Ae for qemu-devel@nongnu.org; Thu, 21 Aug 2008 14:01:15 -0400 Received: from [199.232.76.173] (port=60121 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KWETD-0004VU-80 for qemu-devel@nongnu.org; Thu, 21 Aug 2008 14:01:15 -0400 Received: from savannah.gnu.org ([199.232.41.3]:41664 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KWET4-00053R-Mq for qemu-devel@nongnu.org; Thu, 21 Aug 2008 14:01:12 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KWESu-0006Zl-E9 for qemu-devel@nongnu.org; Thu, 21 Aug 2008 18:00:56 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KWESt-0006Zc-4S for qemu-devel@nongnu.org; Thu, 21 Aug 2008 18:00:56 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Thu, 21 Aug 2008 18:00:55 +0000 Subject: [Qemu-devel] [5045] Fix OSS on OpenBSD Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5045 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5045 Author: blueswir1 Date: 2008-08-21 18:00:53 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Fix OSS on OpenBSD Modified Paths: -------------- trunk/Makefile.target trunk/configure Modified: trunk/Makefile.target =================================================================== --- trunk/Makefile.target 2008-08-21 17:58:08 UTC (rev 5044) +++ trunk/Makefile.target 2008-08-21 18:00:53 UTC (rev 5045) @@ -495,6 +495,9 @@ ifdef CONFIG_FMOD LIBS += $(CONFIG_FMOD_LIB) endif +ifdef CONFIG_OSS +LIBS += $(CONFIG_OSS_LIB) +endif SOUND_HW = sb16.o es1370.o ifdef CONFIG_AC97 Modified: trunk/configure =================================================================== --- trunk/configure 2008-08-21 17:58:08 UTC (rev 5044) +++ trunk/configure 2008-08-21 18:00:53 UTC (rev 5045) @@ -92,6 +92,7 @@ vde="yes" fmod_lib="" fmod_inc="" +oss_lib="" vnc_tls="yes" bsd="no" linux="no" @@ -153,6 +154,7 @@ openbsd="yes" audio_drv_list="oss" audio_possible_drivers="oss sdl esd" +oss_lib="-lossaudio" ;; Darwin) bsd="yes" @@ -273,6 +275,8 @@ ;; --fmod-inc=*) fmod_inc="$optarg" ;; + --oss-lib=*) oss_lib="$optarg" + ;; --audio-card-list=*) audio_card_list=`echo "$optarg" | sed -e 's/,/ /g'` ;; --audio-drv-list=*) audio_drv_list="$optarg" @@ -437,6 +441,7 @@ echo " --disable-darwin-user disable all darwin usermode emulation targets" echo " --fmod-lib path to FMOD library" echo " --fmod-inc path to FMOD includes" +echo " --oss-lib path to OSS library" echo " --enable-uname-release=R Return R for uname -r in usermode emulation" echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9" echo " --disable-vde disable support for vde network" @@ -823,6 +828,10 @@ "pa_simple *s = NULL; pa_simple_free(s); return 0;" ;; + oss|sdl|core|wav|dsound) + # XXX: Probes for CoreAudio, DirectSound, SDL(?) + ;; + *) echo "$audio_possible_drivers" | grep -q "\<$drv\>" || { echo @@ -832,11 +841,6 @@ exit 1 } ;; - - oss|sdl|core|wav|dsound) - # XXX: Probes for CoreAudio, DirectSound, SDL(?) - ;; - esac done @@ -1145,6 +1149,8 @@ if test "$drv" = "fmod"; then echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak + elif test "$drv" = "oss"; then + echo "CONFIG_OSS_LIB=$oss_lib" >> $config_mak fi done echo "" >>$config_h