gwj / at91sam9263 · Commits

Commit 7aac6cb17b7320faf0483f39f20dc52adc379957

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent ef7635ec

make fmod also use FMOD_{LIBS,CFLAGS} 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
Makefile
  View file @7aac6cb
@@ -124,7 +124,7 @@ ifdef CONFIG_COREAUDIO @@ -124,7 +124,7 @@ ifdef CONFIG_COREAUDIO
124 AUDIO_PT = y 124 AUDIO_PT = y
125 endif 125 endif
126 ifdef CONFIG_FMOD 126 ifdef CONFIG_FMOD
127 -audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS) 127 +audio/audio.o audio/fmodaudio.o: CPPFLAGS := $(FMOD_CFLAGS) $(CPPFLAGS)
128 endif 128 endif
129 ifdef CONFIG_ESD 129 ifdef CONFIG_ESD
130 AUDIO_PT = y 130 AUDIO_PT = y
Makefile.target
  View file @7aac6cb
@@ -437,7 +437,7 @@ ifdef CONFIG_DSOUND @@ -437,7 +437,7 @@ ifdef CONFIG_DSOUND
437 LIBS += -lole32 -ldxguid 437 LIBS += -lole32 -ldxguid
438 endif 438 endif
439 ifdef CONFIG_FMOD 439 ifdef CONFIG_FMOD
440 -LIBS += $(CONFIG_FMOD_LIB) 440 +LIBS += $(FMOD_LIBS)
441 endif 441 endif
442 ifdef CONFIG_OSS 442 ifdef CONFIG_OSS
443 LIBS += $(CONFIG_OSS_LIB) 443 LIBS += $(CONFIG_OSS_LIB)
configure
  View file @7aac6cb
@@ -1636,8 +1636,8 @@ for drv in $audio_drv_list; do @@ -1636,8 +1636,8 @@ for drv in $audio_drv_list; do
1636 def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'` 1636 def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
1637 echo "$def=y" >> $config_host_mak 1637 echo "$def=y" >> $config_host_mak
1638 if test "$drv" = "fmod"; then 1638 if test "$drv" = "fmod"; then
1639 - echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_host_mak  
1640 - echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_host_mak 1639 + echo "FMOD_LIBS=$fmod_lib" >> $config_host_mak
  1640 + echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
1641 elif test "$drv" = "oss"; then 1641 elif test "$drv" = "oss"; then
1642 echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak 1642 echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
1643 fi 1643 fi