From 7aac6cb17b7320faf0483f39f20dc52adc379957 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 27 Jul 2009 16:12:47 +0200 Subject: [PATCH] make fmod also use FMOD_{LIBS,CFLAGS} Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- Makefile | 2 +- Makefile.target | 2 +- configure | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7dc83fdc48..c176aa23df 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 f512fd1f16..bb2885a773 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 227a8c790e..ce9ec3060e 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