[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/47] make fmod also use FMOD_{LIBS,CFLAGS}
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 08/47] make fmod also use FMOD_{LIBS,CFLAGS} |
Date: |
Mon, 27 Jul 2009 16:12:47 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 2 +-
Makefile.target | 2 +-
configure | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 7dc83fd..c176aa2 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ ifdef CONFIG_COREAUDIO
AUDIO_PT = y
endif
ifdef CONFIG_FMOD
-audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS)
+audio/audio.o audio/fmodaudio.o: CPPFLAGS := $(FMOD_CFLAGS) $(CPPFLAGS)
endif
ifdef CONFIG_ESD
AUDIO_PT = y
diff --git a/Makefile.target b/Makefile.target
index f512fd1..bb2885a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -437,7 +437,7 @@ ifdef CONFIG_DSOUND
LIBS += -lole32 -ldxguid
endif
ifdef CONFIG_FMOD
-LIBS += $(CONFIG_FMOD_LIB)
+LIBS += $(FMOD_LIBS)
endif
ifdef CONFIG_OSS
LIBS += $(CONFIG_OSS_LIB)
diff --git a/configure b/configure
index 227a8c7..ce9ec30 100755
--- a/configure
+++ b/configure
@@ -1636,8 +1636,8 @@ for drv in $audio_drv_list; do
def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
echo "$def=y" >> $config_host_mak
if test "$drv" = "fmod"; then
- echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_host_mak
- echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_host_mak
+ echo "FMOD_LIBS=$fmod_lib" >> $config_host_mak
+ echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
elif test "$drv" = "oss"; then
echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
fi
--
1.6.2.5
- [Qemu-devel] [PATCH v3 00/47] More configure/Makefile cleanups, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 01/47] change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 02/47] Remove SP_CFLAGS and SP_LDFLAGS, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 04/47] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 03/47] target_arch2 is redefined unconditionally later, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 07/47] remove CONFIG_ from BLUEZ_{LIBS,FLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 05/47] use same algorithm for testing and, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 06/47] remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 08/47] make fmod also use FMOD_{LIBS,CFLAGS},
Juan Quintela <=
- [Qemu-devel] [PATCH 10/47] move printing of config-host.mak variables to end of generation, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 11/47] more specific config.mak can overwrote more general config.mak, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 09/47] make oss use OSS_LIBS, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 13/47] Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 12/47] Add -static in configure if needed, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 15/47] fix indententation, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 14/47] Refactor code to remove one #ifdef CONFIG_FDT, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 18/47] define MAP_ANONYMOUS if it is not defined in qemu-common.h, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 23/47] rename HAVE_GPROF to TARGET_GPROF, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 20/47] rename HAVE_IOVEC to CONFIG_IOVEC, Juan Quintela, 2009/07/27