提交 6a485418 编写于 作者: G Gerd Hoffmann

audio: probe audio drivers by default

Add the drivers listed in audio_possible_drivers to audio_drv_list,
using the try-* variants.  That way the probable drivers are compiled by
default if possible.

Additioal tweaks:
  linux: reorder to: pa alsa sdl oss.
  *bsd: drop pa.
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
Message-id: 20190124112055.547-7-kraxel@redhat.com
上级 fb37ce92
...@@ -794,13 +794,13 @@ MINGW32*) ...@@ -794,13 +794,13 @@ MINGW32*)
;; ;;
GNU/kFreeBSD) GNU/kFreeBSD)
bsd="yes" bsd="yes"
audio_drv_list="oss" audio_drv_list="oss try-sdl"
audio_possible_drivers="oss sdl pa" audio_possible_drivers="oss sdl pa"
;; ;;
FreeBSD) FreeBSD)
bsd="yes" bsd="yes"
make="${MAKE-gmake}" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss try-sdl"
audio_possible_drivers="oss sdl pa" audio_possible_drivers="oss sdl pa"
# needed for kinfo_getvmmap(3) in libutil.h # needed for kinfo_getvmmap(3) in libutil.h
LIBS="-lutil $LIBS" LIBS="-lutil $LIBS"
...@@ -813,14 +813,14 @@ FreeBSD) ...@@ -813,14 +813,14 @@ FreeBSD)
DragonFly) DragonFly)
bsd="yes" bsd="yes"
make="${MAKE-gmake}" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss try-sdl"
audio_possible_drivers="oss sdl pa" audio_possible_drivers="oss sdl pa"
HOST_VARIANT_DIR="dragonfly" HOST_VARIANT_DIR="dragonfly"
;; ;;
NetBSD) NetBSD)
bsd="yes" bsd="yes"
make="${MAKE-gmake}" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss try-sdl"
audio_possible_drivers="oss sdl" audio_possible_drivers="oss sdl"
oss_lib="-lossaudio" oss_lib="-lossaudio"
HOST_VARIANT_DIR="netbsd" HOST_VARIANT_DIR="netbsd"
...@@ -845,7 +845,7 @@ Darwin) ...@@ -845,7 +845,7 @@ Darwin)
LDFLAGS="-arch x86_64 $LDFLAGS" LDFLAGS="-arch x86_64 $LDFLAGS"
fi fi
cocoa="yes" cocoa="yes"
audio_drv_list="coreaudio" audio_drv_list="coreaudio try-sdl"
audio_possible_drivers="coreaudio sdl" audio_possible_drivers="coreaudio sdl"
LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS" LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS"
libs_softmmu="-F/System/Library/Frameworks -framework Cocoa -framework IOKit $libs_softmmu" libs_softmmu="-F/System/Library/Frameworks -framework Cocoa -framework IOKit $libs_softmmu"
...@@ -861,7 +861,7 @@ SunOS) ...@@ -861,7 +861,7 @@ SunOS)
install="${INSTALL-ginstall}" install="${INSTALL-ginstall}"
smbd="${SMBD-/usr/sfw/sbin/smbd}" smbd="${SMBD-/usr/sfw/sbin/smbd}"
if test -f /usr/include/sys/soundcard.h ; then if test -f /usr/include/sys/soundcard.h ; then
audio_drv_list="oss" audio_drv_list="oss try-sdl"
fi fi
audio_possible_drivers="oss sdl" audio_possible_drivers="oss sdl"
# needed for CMSG_ macros in sys/socket.h # needed for CMSG_ macros in sys/socket.h
...@@ -879,7 +879,7 @@ Haiku) ...@@ -879,7 +879,7 @@ Haiku)
LIBS="-lposix_error_mapper -lnetwork $LIBS" LIBS="-lposix_error_mapper -lnetwork $LIBS"
;; ;;
Linux) Linux)
audio_drv_list="oss" audio_drv_list="try-pa try-alsa try-sdl oss"
audio_possible_drivers="oss alsa sdl pa" audio_possible_drivers="oss alsa sdl pa"
linux="yes" linux="yes"
linux_user="yes" linux_user="yes"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册