mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsys: Move audio libs to per object

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907082918.7299-5-famz@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Fam Zheng 2017-09-07 16:29:13 +08:00
parent 8ecc89f6e7
commit b11499117c
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/Makefile.objs
View File

@ -12,3 +12,8 @@ common-obj-y += wavcapture.o
sdlaudio.o-cflags := $(SDL_CFLAGS) sdlaudio.o-cflags := $(SDL_CFLAGS)
sdlaudio.o-libs := $(SDL_LIBS) sdlaudio.o-libs := $(SDL_LIBS)
alsaaudio.o-libs := $(ALSA_LIBS)
paaudio.o-libs := $(PULSE_LIBS)
coreaudio.o-libs := $(COREAUDIO_LIBS)
dsoundaudio.o-libs := $(DSOUND_LIBS)
ossaudio.o-libs := $(OSS_LIBS)

15
configure vendored
View File

@ -3032,13 +3032,13 @@ for drv in $audio_drv_list; do
alsa) alsa)
audio_drv_probe $drv alsa/asoundlib.h -lasound \ audio_drv_probe $drv alsa/asoundlib.h -lasound \
"return snd_pcm_close((snd_pcm_t *)0);" "return snd_pcm_close((snd_pcm_t *)0);"
libs_softmmu="-lasound $libs_softmmu" alsa_libs="-lasound"
;; ;;
pa) pa)
audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \
"pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); return 0;" "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); return 0;"
libs_softmmu="-lpulse $libs_softmmu" pulse_libs="-lpulse"
audio_pt_int="yes" audio_pt_int="yes"
;; ;;
@ -3049,16 +3049,16 @@ for drv in $audio_drv_list; do
;; ;;
coreaudio) coreaudio)
libs_softmmu="-framework CoreAudio $libs_softmmu" coreaudio_libs="-framework CoreAudio"
;; ;;
dsound) dsound)
libs_softmmu="-lole32 -ldxguid $libs_softmmu" dsound_libs="-lole32 -ldxguid"
audio_win_int="yes" audio_win_int="yes"
;; ;;
oss) oss)
libs_softmmu="$oss_lib $libs_softmmu" oss_libs="$oss_lib"
;; ;;
wav) wav)
@ -5512,6 +5512,11 @@ for drv in $audio_drv_list; do
def=CONFIG_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]') def=CONFIG_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
echo "$def=y" >> $config_host_mak echo "$def=y" >> $config_host_mak
done done
echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak
echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
echo "OSS_LIBS=$oss_libs" >> $config_host_mak
if test "$audio_pt_int" = "yes" ; then if test "$audio_pt_int" = "yes" ; then
echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak
fi fi