[Qemu-devel] [PATCH 29/37] fold FMOD_LIBS on generic LIBS

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target |    3 ---
 configure       |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index b79ae93..a9605b5 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -413,9 +413,6 @@ endif
 ifdef CONFIG_DSOUND
 LIBS += -lole32 -ldxguid
 endif
-ifdef CONFIG_FMOD
-LIBS += $(FMOD_LIBS)
-endif
 ifdef CONFIG_OSS
 LIBS += $(OSS_LIBS)
 endif
diff --git a/configure b/configure
index c627ebb..440f793 100755
--- a/configure
+++ b/configure
@@ -1620,7 +1620,7 @@ 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 "FMOD_LIBS=$fmod_lib" >> $config_host_mak
+        LIBS="$LIBS $fmod_lib"
         echo "FMOD_CFLAGS=$fmod_inc" >> $config_host_mak
     elif test "$drv" = "oss"; then
         echo "OSS_LIBS=$oss_lib" >> $config_host_mak
-- 
1.6.2.5