[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 71/81] Consolidate audio flags in configure
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 71/81] Consolidate audio flags in configure |
Date: |
Mon, 3 Aug 2009 14:47:02 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 17 -----------------
configure | 11 +++++++++++
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 6b3d40f..22d1d53 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -202,10 +202,6 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o
acpi.o piix_pci.o
obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o
-ifeq ($(TARGET_BASE_ARCH), i386)
-QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
-endif
-
# shared objects
obj-ppc-y = ppc.o ide.o vga.o $(sound-obj-y) dma.o openpic.o
# PREP target
@@ -223,11 +219,6 @@ obj-ppc-y += ppc440.o ppc440_bamboo.o
# PowerPC E500 boards
obj-ppc-y += ppce500_pci.o ppce500_mpc8544ds.o
obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
-
-ifeq ($(TARGET_BASE_ARCH), ppc)
-QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
-endif
-
obj-ppc-$(CONFIG_FDT) += device_tree.o
obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
@@ -239,10 +230,6 @@ obj-mips-y += mipsnet.o
obj-mips-y += pflash_cfi01.o
obj-mips-y += vmware_vga.o
-ifeq ($(TARGET_BASE_ARCH), mips)
-QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
-endif
-
obj-microblaze-y = petalogix_s3adsp1800_mmu.o
obj-microblaze-y += microblaze_pic_cpu.o
@@ -299,10 +286,6 @@ obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o
syborg_keyboard.o
obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
obj-arm-y += syborg_virtio.o
-ifeq ($(TARGET_BASE_ARCH), arm)
-QEMU_CFLAGS += -DHAS_AUDIO
-endif
-
obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o
obj-sh4-y += ide.o
diff --git a/configure b/configure
index 9bc2303..ccf0fa2 100755
--- a/configure
+++ b/configure
@@ -2134,6 +2134,17 @@ ia64)
;;
esac
+if test "$target_softmmu" = "yes" ; then
+ case "$TARGET_BASE_ARCH" in
+ arm)
+ cflags="-DHAS_AUDIO $cflags"
+ ;;
+ i386|mips|ppc)
+ cflags="-DHAS_AUDIO -DHAS_AUDIO_CHOICE $cflags"
+ ;;
+ esac
+fi
+
if test "$target_softmmu" = "yes" -a \( \
"$TARGET_ARCH" = "microblaze" -o \
"$TARGET_ARCH" = "cris" \) ; then
--
1.6.2.5
- [Qemu-devel] [PATCH 67/81] AUDIO_PT is not needed, (continued)
- [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, 2009/08/03
- [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 <=
[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
[Qemu-devel] [PATCH 74/81] Disable aio in mingw32, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 76/81] VDE libs are used both by tools and softmmu, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 75/81] Add libs_tools support, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 77/81] CURL libs are used both by tools and softmmu, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 79/81] convert gprof flags to style of rest of Makefile, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 78/81] Add cocoa libs at Darwin selection time, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 80/81] Move libsunpath to use the same style than everything else, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 81/81] rename aio/CONFIG_AIO to posix_aio/CONFIG_POSIX_AIO, Juan Quintela, 2009/08/03