[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 68/81] Generate CONFIG_AUDIO_PT_INT in configure
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 68/81] Generate CONFIG_AUDIO_PT_INT in configure |
Date: |
Mon, 3 Aug 2009 14:46:59 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 8 +-------
configure | 6 ++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index df8fb0e..09d9ed0 100644
--- a/Makefile
+++ b/Makefile
@@ -96,12 +96,6 @@ obj-$(CONFIG_WIN32) += tap-win32.o
obj-$(CONFIG_POSIX) += migration-exec.o
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-$(CONFIG_SDL) += sdlaudio.o
@@ -112,7 +106,7 @@ audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
audio-obj-$(CONFIG_FMOD) += fmodaudio.o
audio-obj-$(CONFIG_ESD) += esdaudio.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
obj-y += $(addprefix audio/, $(audio-obj-y))
diff --git a/configure b/configure
index 9d54aaa..9bc2303 100755
--- a/configure
+++ b/configure
@@ -46,6 +46,7 @@ objcopy="objcopy"
ld="ld"
helper_cflags=""
libs_softmmu=""
+audio_pt_int=""
# parse CC options first
for opt do
@@ -1011,12 +1012,14 @@ for drv in $audio_drv_list; do
esd)
audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);'
libs_softmmu="-lesd $libs_softmmu"
+ audio_pt_int="yes"
;;
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"
+ audio_pt_int="yes"
;;
coreaudio)
@@ -1622,6 +1625,9 @@ for drv in $audio_drv_list; do
echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
fi
done
+if test "$audio_pt_int" = "yes" ; then
+ echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak
+fi
if test "$mixemu" = "yes" ; then
echo "CONFIG_MIXEMU=y" >> $config_host_mak
fi
--
1.6.2.5
- [Qemu-devel] [PATCH 57/81] Move ia64 QEMU_CFLAGS target to configure, (continued)
- [Qemu-devel] [PATCH 57/81] Move ia64 QEMU_CFLAGS target to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 58/81] this bit was already generated in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 59/81] Fold TARGET_GPROF handling in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 60/81] Generate more conmmon CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 61/81] Added CONFIG_NEED_MMU for microblaze and cris, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 62/81] Move dis-* selection to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 63/81] Use only one KVM_CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 64/81] Use one less HELPER_CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 67/81] AUDIO_PT is not needed, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 66/81] FMOD_CFLAGS is not set when CONFIG_FMOD is undef, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 68/81] Generate CONFIG_AUDIO_PT_INT in configure,
Juan Quintela <=
- [Qemu-devel] [PATCH 65/81] Make slirp include dir globlal in cflags, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 69/81] CONFIG_POSIX makes more sense that not CONFIG_WIN32, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 70/81] remove last 3 uses of :=, everywhere else uses += or =, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 71/81] Consolidate audio flags in configure, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 73/81] use TARGET_<arch name> for selection, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 72/81] We also need TARGET_<arechname> in Makefiles, Juan Quintela, 2009/08/03