sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

Fix OSS on OpenBSD 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5045 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-08-21 18:00:53 +00:00
parent 363a37d520
commit 2f6a1ab038
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.target
View File

@ -495,6 +495,9 @@ endif
ifdef CONFIG_FMOD ifdef CONFIG_FMOD
LIBS += $(CONFIG_FMOD_LIB) LIBS += $(CONFIG_FMOD_LIB)
endif endif
ifdef CONFIG_OSS
LIBS += $(CONFIG_OSS_LIB)
endif
SOUND_HW = sb16.o es1370.o SOUND_HW = sb16.o es1370.o
ifdef CONFIG_AC97 ifdef CONFIG_AC97

16
configure vendored
View File

@ -92,6 +92,7 @@ slirp="yes"
vde="yes" vde="yes"
fmod_lib="" fmod_lib=""
fmod_inc="" fmod_inc=""
oss_lib=""
vnc_tls="yes" vnc_tls="yes"
bsd="no" bsd="no"
linux="no" linux="no"
@ -153,6 +154,7 @@ bsd="yes"
openbsd="yes" openbsd="yes"
audio_drv_list="oss" audio_drv_list="oss"
audio_possible_drivers="oss sdl esd" audio_possible_drivers="oss sdl esd"
oss_lib="-lossaudio"
;; ;;
Darwin) Darwin)
bsd="yes" bsd="yes"
@ -273,6 +275,8 @@ for opt do
;; ;;
--fmod-inc=*) fmod_inc="$optarg" --fmod-inc=*) fmod_inc="$optarg"
;; ;;
--oss-lib=*) oss_lib="$optarg"
;;
--audio-card-list=*) audio_card_list=`echo "$optarg" | sed -e 's/,/ /g'` --audio-card-list=*) audio_card_list=`echo "$optarg" | sed -e 's/,/ /g'`
;; ;;
--audio-drv-list=*) audio_drv_list="$optarg" --audio-drv-list=*) audio_drv_list="$optarg"
@ -437,6 +441,7 @@ echo " --enable-darwin-user enable all darwin usermode emulation targets"
echo " --disable-darwin-user disable all darwin usermode emulation targets" echo " --disable-darwin-user disable all darwin usermode emulation targets"
echo " --fmod-lib path to FMOD library" echo " --fmod-lib path to FMOD library"
echo " --fmod-inc path to FMOD includes" 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 " --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 " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
echo " --disable-vde disable support for vde network" echo " --disable-vde disable support for vde network"
@ -823,6 +828,10 @@ for drv in $audio_drv_list; do
"pa_simple *s = NULL; pa_simple_free(s); return 0;" "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 "$audio_possible_drivers" | grep -q "\<$drv\>" || {
echo echo
@ -832,11 +841,6 @@ for drv in $audio_drv_list; do
exit 1 exit 1
} }
;; ;;
oss|sdl|core|wav|dsound)
# XXX: Probes for CoreAudio, DirectSound, SDL(?)
;;
esac esac
done done
@ -1145,6 +1149,8 @@ for drv in $audio_drv_list; do
if test "$drv" = "fmod"; then if test "$drv" = "fmod"; then
echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
elif test "$drv" = "oss"; then
echo "CONFIG_OSS_LIB=$oss_lib" >> $config_mak
fi fi
done done
echo "" >>$config_h echo "" >>$config_h