Generate CONFIG_AUDIO_PT_INT in configure
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
This commit is contained in:
parent
611b0db5ae
commit
67f86e8e2a
8
Makefile
8
Makefile
@ -96,12 +96,6 @@ obj-$(CONFIG_WIN32) += tap-win32.o
|
|||||||
obj-$(CONFIG_POSIX) += migration-exec.o
|
obj-$(CONFIG_POSIX) += migration-exec.o
|
||||||
|
|
||||||
audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
|
audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
|
||||||
ifdef CONFIG_ESD
|
|
||||||
AUDIO_PT_INT = y
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PA
|
|
||||||
AUDIO_PT_INT = y
|
|
||||||
endif
|
|
||||||
|
|
||||||
audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
|
audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
|
||||||
audio-obj-$(CONFIG_SDL) += sdlaudio.o
|
audio-obj-$(CONFIG_SDL) += sdlaudio.o
|
||||||
@ -112,7 +106,7 @@ audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
|
|||||||
audio-obj-$(CONFIG_FMOD) += fmodaudio.o
|
audio-obj-$(CONFIG_FMOD) += fmodaudio.o
|
||||||
audio-obj-$(CONFIG_ESD) += esdaudio.o
|
audio-obj-$(CONFIG_ESD) += esdaudio.o
|
||||||
audio-obj-$(CONFIG_PA) += paaudio.o
|
audio-obj-$(CONFIG_PA) += paaudio.o
|
||||||
audio-obj-$(AUDIO_PT_INT) += audio_pt_int.o
|
audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
|
||||||
audio-obj-y += wavcapture.o
|
audio-obj-y += wavcapture.o
|
||||||
obj-y += $(addprefix audio/, $(audio-obj-y))
|
obj-y += $(addprefix audio/, $(audio-obj-y))
|
||||||
|
|
||||||
|
6
configure
vendored
6
configure
vendored
@ -46,6 +46,7 @@ objcopy="objcopy"
|
|||||||
ld="ld"
|
ld="ld"
|
||||||
helper_cflags=""
|
helper_cflags=""
|
||||||
libs_softmmu=""
|
libs_softmmu=""
|
||||||
|
audio_pt_int=""
|
||||||
|
|
||||||
# parse CC options first
|
# parse CC options first
|
||||||
for opt do
|
for opt do
|
||||||
@ -1011,12 +1012,14 @@ for drv in $audio_drv_list; do
|
|||||||
esd)
|
esd)
|
||||||
audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);'
|
audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);'
|
||||||
libs_softmmu="-lesd $libs_softmmu"
|
libs_softmmu="-lesd $libs_softmmu"
|
||||||
|
audio_pt_int="yes"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
pa)
|
pa)
|
||||||
audio_drv_probe $drv pulse/simple.h -lpulse-simple \
|
audio_drv_probe $drv pulse/simple.h -lpulse-simple \
|
||||||
"pa_simple *s = NULL; pa_simple_free(s); return 0;"
|
"pa_simple *s = NULL; pa_simple_free(s); return 0;"
|
||||||
libs_softmmu="-lpulse-simple $libs_softmmu"
|
libs_softmmu="-lpulse-simple $libs_softmmu"
|
||||||
|
audio_pt_int="yes"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
coreaudio)
|
coreaudio)
|
||||||
@ -1622,6 +1625,9 @@ for drv in $audio_drv_list; do
|
|||||||
echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
|
echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
if test "$audio_pt_int" = "yes" ; then
|
||||||
|
echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak
|
||||||
|
fi
|
||||||
if test "$mixemu" = "yes" ; then
|
if test "$mixemu" = "yes" ; then
|
||||||
echo "CONFIG_MIXEMU=y" >> $config_host_mak
|
echo "CONFIG_MIXEMU=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user