OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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:
Juan Quintela 2009-07-27 16:12:47 +02:00 committed by Anthony Liguori
parent ef7635eccc
commit 7aac6cb17b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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

2
Makefile.target
View File

@ -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)

4
configure vendored
View File

@ -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