[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/38] buildsys: Move audio libs to per object
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 31/38] buildsys: Move audio libs to per object |
Date: |
Fri, 8 Sep 2017 17:54:59 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
audio/Makefile.objs | 5 +++++
configure | 15 ++++++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/audio/Makefile.objs b/audio/Makefile.objs
index c20695668f..8a5ede6e2b 100644
--- a/audio/Makefile.objs
+++ b/audio/Makefile.objs
@@ -12,3 +12,8 @@ common-obj-y += wavcapture.o
sdlaudio.o-cflags := $(SDL_CFLAGS)
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)
diff --git a/configure b/configure
index 2b3db2f5c3..ddddfde599 100755
--- a/configure
+++ b/configure
@@ -3044,13 +3044,13 @@ for drv in $audio_drv_list; do
alsa)
audio_drv_probe $drv alsa/asoundlib.h -lasound \
"return snd_pcm_close((snd_pcm_t *)0);"
- libs_softmmu="-lasound $libs_softmmu"
+ alsa_libs="-lasound"
;;
pa)
audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \
"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"
;;
@@ -3061,16 +3061,16 @@ for drv in $audio_drv_list; do
;;
coreaudio)
- libs_softmmu="-framework CoreAudio $libs_softmmu"
+ coreaudio_libs="-framework CoreAudio"
;;
dsound)
- libs_softmmu="-lole32 -ldxguid $libs_softmmu"
+ dsound_libs="-lole32 -ldxguid"
audio_win_int="yes"
;;
oss)
- libs_softmmu="$oss_lib $libs_softmmu"
+ oss_libs="$oss_lib"
;;
wav)
@@ -5553,6 +5553,11 @@ for drv in $audio_drv_list; do
def=CONFIG_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
echo "$def=y" >> $config_host_mak
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
echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak
fi
--
2.13.5
- [Qemu-devel] [PULL 22/38] docker: Use unconfined security profile, (continued)
- [Qemu-devel] [PULL 22/38] docker: Use unconfined security profile, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 23/38] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 24/38] docker: Add test-block, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 25/38] docker: Drop 'set -e' from run script, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 26/38] vl: Don't include vde header, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 27/38] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 29/38] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 30/38] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 31/38] buildsys: Move audio libs to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 34/38] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 35/38] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 37/38] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 36/38] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 38/38] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, no-reply, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, Peter Maydell, 2017/09/08