make fmod also use FMOD_{LIBS,CFLAGS}
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
ef7635eccc
commit
7aac6cb17b
2
Makefile
2
Makefile
|
@ -124,7 +124,7 @@ ifdef CONFIG_COREAUDIO
|
||||||
AUDIO_PT = y
|
AUDIO_PT = y
|
||||||
endif
|
endif
|
||||||
ifdef CONFIG_FMOD
|
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
|
endif
|
||||||
ifdef CONFIG_ESD
|
ifdef CONFIG_ESD
|
||||||
AUDIO_PT = y
|
AUDIO_PT = y
|
||||||
|
|
|
@ -437,7 +437,7 @@ ifdef CONFIG_DSOUND
|
||||||
LIBS += -lole32 -ldxguid
|
LIBS += -lole32 -ldxguid
|
||||||
endif
|
endif
|
||||||
ifdef CONFIG_FMOD
|
ifdef CONFIG_FMOD
|
||||||
LIBS += $(CONFIG_FMOD_LIB)
|
LIBS += $(FMOD_LIBS)
|
||||||
endif
|
endif
|
||||||
ifdef CONFIG_OSS
|
ifdef CONFIG_OSS
|
||||||
LIBS += $(CONFIG_OSS_LIB)
|
LIBS += $(CONFIG_OSS_LIB)
|
||||||
|
|
|
@ -1636,8 +1636,8 @@ for drv in $audio_drv_list; do
|
||||||
def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
|
def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
|
||||||
echo "$def=y" >> $config_host_mak
|
echo "$def=y" >> $config_host_mak
|
||||||
if test "$drv" = "fmod"; then
|
if test "$drv" = "fmod"; then
|
||||||
echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_host_mak
|
echo "FMOD_LIBS=$fmod_lib" >> $config_host_mak
|
||||||
echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_host_mak
|
echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
|
||||||
elif test "$drv" = "oss"; then
|
elif test "$drv" = "oss"; then
|
||||||
echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
|
echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue