diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-07-28 12:20:14 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-08-27 05:40:08 -0700 |
| commit | 415a4b1f54f896bf28abe1beb2d8005a3d98f531 (patch) | |
| tree | 417214fffb0be3e0f9e150fd74d83bf8bcaa1997 /Makefile.android | |
| parent | 3f16680b70d6c065fd2c1672ae324a49c5d1d316 (diff) | |
| download | external_qemu-415a4b1f54f896bf28abe1beb2d8005a3d98f531.zip external_qemu-415a4b1f54f896bf28abe1beb2d8005a3d98f531.tar.gz external_qemu-415a4b1f54f896bf28abe1beb2d8005a3d98f531.tar.bz2 | |
Add a PulseAudio audio backend for Linux.
Change-Id: Ifaf876c41ab6c7275ba7d1dc8e12139f62840cd6
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.android b/Makefile.android index e6564f4..6cd1cec 100644 --- a/Makefile.android +++ b/Makefile.android @@ -374,6 +374,7 @@ endif ifeq ($(HOST_OS),linux) CONFIG_OSS ?= yes CONFIG_ALSA ?= yes + CONFIG_PULSEAUDIO ?= yes CONFIG_ESD ?= yes endif @@ -392,6 +393,11 @@ ifeq ($(CONFIG_WINAUDIO),yes) AUDIO_CFLAGS += -DCONFIG_WINAUDIO endif +ifeq ($(CONFIG_PULSEAUDIO),yes) + AUDIO_SOURCES += paaudio.c audio_pt_int.c + AUDIO_CFLAGS += -DCONFIG_PULSEAUDIO +endif + ifeq ($(CONFIG_ALSA),yes) AUDIO_SOURCES += alsaaudio.c audio_pt_int.c AUDIO_CFLAGS += -DCONFIG_ALSA @@ -407,7 +413,7 @@ ifeq ($(CONFIG_OSS),yes) AUDIO_CFLAGS += -DCONFIG_OSS endif -AUDIO_SOURCES := $(AUDIO_SOURCES:%=audio/%) +AUDIO_SOURCES := $(call sort,$(AUDIO_SOURCES:%=audio/%)) # determine whether we're going to use the prebuilt # audio library (this is useful on Linux to avoid requiring @@ -1119,6 +1125,11 @@ endif LOCAL_LDLIBS += $(QEMU_AUDIO_LIB) +ifeq ($(HOST_OS),darwin) + FRAMEWORKS := OpenGL Cocoa QuickTime ApplicationServices Carbon IOKit + LOCAL_LDLIBS += $(FRAMEWORKS:%=-Wl,-framework,%) +endif + # Generate a completely static executable if needed. # Note that this means no sound and graphics on Linux. # |