[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/20] add $fmod_inc to CPPFLAGS
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 05/20] add $fmod_inc to CPPFLAGS |
Date: |
Tue, 21 Jul 2009 00:13:15 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 5 -----
configure | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index be5452c..3c2ab01 100644
--- a/Makefile
+++ b/Makefile
@@ -90,11 +90,6 @@ obj-$(CONFIG_BRLAPI) += baum.o
obj-$(CONFIG_WIN32) += tap-win32.o
obj-$(CONFIG_NOWIN32) += migration-exec.o
-ifdef CONFIG_FMOD
-audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(FMOD_CFLAGS) $(CPPFLAGS)
-endif
-
-
audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
audio-obj-$(CONFIG_SDL) += sdlaudio.o
audio-obj-$(CONFIG_OSS) += ossaudio.o
diff --git a/configure b/configure
index cadaeaf..9b1234c 100755
--- a/configure
+++ b/configure
@@ -1620,7 +1620,7 @@ for drv in $audio_drv_list; do
echo "$def=y" >> $config_host_mak
if test "$drv" = "fmod"; then
LIBS="$LIBS $fmod_lib"
- echo "FMOD_CFLAGS=$fmod_inc" >> $config_host_mak
+ CPPFLAGS="$CPPFLAGS -I$fmod_inc"
elif test "$drv" = "oss"; then
LIBS="$LIBS $oss_lib"
elif test "$drv" = "alsa"; then
--
1.6.2.5
- [Qemu-devel] [PATCH 00/20] More configure/Makefile cleanups, quintela, 2009/07/20
- [Qemu-devel] [PATCH 01/20] add coreaudio libs at the same place that the rest of the audior drivers, quintela, 2009/07/20
- [Qemu-devel] [PATCH 02/20] move the decision of using threads or not in audio from Makefile to configure, quintela, 2009/07/20
- [Qemu-devel] [PATCH 04/20] Use CONFIG_NOWIN32 previus define to simplify Makefile, quintela, 2009/07/20
- [Qemu-devel] [PATCH 03/20] Add CONFIG_NOWIN32, quintela, 2009/07/20
- [Qemu-devel] [PATCH 05/20] add $fmod_inc to CPPFLAGS,
quintela <=
- [Qemu-devel] [PATCH 06/20] add SLIRP directory to include list in case it is needed, quintela, 2009/07/20
- [Qemu-devel] [PATCH 08/20] fold VNC_SASL_CFLAGS into CPPCFLAGS, quintela, 2009/07/20
- [Qemu-devel] [PATCH 07/20] fold VNC_TLS_CFLAGS into CPPCFLAGS, quintela, 2009/07/20
- [Qemu-devel] [PATCH 10/20] -lz is needed for all binaries, move it to LIBS, quintela, 2009/07/20
- [Qemu-devel] [PATCH 09/20] put together uses of -lvdeplug, quintela, 2009/07/20
- [Qemu-devel] [PATCH 11/20] put together uses of xen libraries, quintela, 2009/07/20
- [Qemu-devel] [PATCH 12/20] the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes, quintela, 2009/07/20
- [Qemu-devel] [PATCH 13/20] sdl_config var is never changed from sdl-config value, quintela, 2009/07/20
- [Qemu-devel] [PATCH 15/20] define SDL_CFLAGS value when we test for SDL, quintela, 2009/07/20
- [Qemu-devel] [PATCH 14/20] remove old sdl config code that was commented, quintela, 2009/07/20