OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Move sound library selection to sound selection

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
This commit is contained in:
Juan Quintela 2009-08-03 14:46:30 +02:00 committed by Anthony Liguori
parent 997e690ab9
commit a4bf678087
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.target
View File

@ -227,24 +227,6 @@ obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
LIBS+=-lz
ifdef CONFIG_ALSA
LIBS += -lasound
endif
ifdef CONFIG_ESD
LIBS += -lesd
endif
ifdef CONFIG_PA
LIBS += -lpulse-simple
endif
ifdef CONFIG_DSOUND
LIBS += -lole32 -ldxguid
endif
ifdef CONFIG_FMOD
LIBS += $(FMOD_LIBS)
endif
ifdef CONFIG_OSS
LIBS += $(OSS_LIBS)
endif
sound-obj-y =
sound-obj-$(CONFIG_SB16) += sb16.o

17
configure vendored
View File

@ -993,6 +993,7 @@ for drv in $audio_drv_list; do
alsa)
audio_drv_probe $drv alsa/asoundlib.h -lasound \
"snd_pcm_t **handle; return snd_pcm_close(*handle);"
libs_softmmu="-lasound $libs_softmmu"
;;
fmod)
@ -1004,22 +1005,33 @@ for drv in $audio_drv_list; do
exit 1
fi
audio_drv_probe $drv fmod.h $fmod_lib "return FSOUND_GetVersion();" "-I $fmod_inc"
libs_softmmu="$fmod_lib $libs_softmmu"
;;
esd)
audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);'
libs_softmmu="-lesd $libs_softmmu"
;;
pa)
audio_drv_probe $drv pulse/simple.h -lpulse-simple \
"pa_simple *s = NULL; pa_simple_free(s); return 0;"
libs_softmmu="-lpulse-simple $libs_softmmu"
;;
coreaudio)
libs_softmmu="-framework CoreAudio $libs_softmmu"
;;
oss|sdl|wav|dsound)
dsound)
libs_softmmu="-lole32 -ldxguid $libs_softmmu"
;;
oss)
libs_softmmu="$oss_lib $libs_softmmu"
;;
sdl|wav)
# XXX: Probes for CoreAudio, DirectSound, SDL(?)
;;
@ -1602,10 +1614,7 @@ for drv in $audio_drv_list; do
def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
echo "$def=y" >> $config_host_mak
if test "$drv" = "fmod"; then
echo "FMOD_LIBS=$fmod_lib" >> $config_host_mak
echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
elif test "$drv" = "oss"; then
echo "OSS_LIBS=$oss_lib" >> $config_host_mak
fi
done
if test "$mixemu" = "yes" ; then