[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/37] make fmod also use FMOD_{LIBS,CFLAGS}
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 08/37] make fmod also use FMOD_{LIBS,CFLAGS} |
Date: |
Fri, 17 Jul 2009 21:21:01 +0200 |
From: Juan Quintela <address@hidden>
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..0bdf188 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 := -I$(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 e5c0e46..c069d8a 100755
--- a/configure
+++ b/configure
@@ -1633,8 +1633,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=$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 00/37] Generate a proper LIBS variable, quintela, 2009/07/17
- [Qemu-devel] [PATCH 01/37] change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 02/37] Remove SP_CFLAGS and SP_LDFLAGS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 03/37] target_arch2 is redefined unconditionally later, quintela, 2009/07/17
- [Qemu-devel] [PATCH 04/37] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 05/37] use same algorithm for testing and, quintela, 2009/07/17
- [Qemu-devel] [PATCH 06/37] remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 09/37] make oss use OSS_LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 07/37] remove CONFIG_ from BLUEZ_{LIBS,FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 08/37] make fmod also use FMOD_{LIBS,CFLAGS},
quintela <=
- [Qemu-devel] [PATCH 10/37] move printing of config-host.mak variables to end of generation, quintela, 2009/07/17
- [Qemu-devel] [PATCH 11/37] more specific config.mak can overwrote more general config.mak, quintela, 2009/07/17
- [Qemu-devel] [PATCH 14/37] CONFIG_SOLARIS always want -lsockt -lnsl -lresolv, quintela, 2009/07/17
- [Qemu-devel] [PATCH 13/37] fold PTHREADLIBS and CLOCKLIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 12/37] generate CPPFLAGS and LIBS on ./configure, quintela, 2009/07/17
- [Qemu-devel] [PATCH 16/37] generate CONFIG_WIN32 libraries in configure, quintela, 2009/07/17
- [Qemu-devel] [PATCH 15/37] Add -static in configure if needed, quintela, 2009/07/17
- [Qemu-devel] [PATCH 18/37] fold CURL_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 17/37] fold VDE_LIBS on generic LIBS, quintela, 2009/07/17