[Qemu-devel] [PATCH 16/37] generate CONFIG_WIN32 libraries in configure

[quintela]

From: Juan Quintela <address@hidden>


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

diff --git a/Makefile b/Makefile
index a50158b..a317a37 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,6 @@ else
 DOCS=
 endif

-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
-
 build-all: $(TOOLS) $(DOCS) roms recurse-all

 config-host.mak: configure
diff --git a/Makefile.target b/Makefile.target
index 78f6f19..209db45 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -54,9 +54,6 @@ endif
 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm
-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
 ifdef CONFIG_SOLARIS
 ifdef NEEDS_LIBSUNMATH
 LIBS+=-lsunmath
diff --git a/configure b/configure
index d3fb000..b7a8222 100755
--- a/configure
+++ b/configure
@@ -1537,6 +1537,7 @@ echo "#define HOST_LONG_BITS $hostlongbits" >> 
$config_host_h
 if test "$mingw32" = "yes" ; then
   echo "CONFIG_WIN32=y" >> $config_host_mak
   echo "#define CONFIG_WIN32 1" >> $config_host_h
+  LIBS="$LIBS -lwinmm -lws2_32 -liphlpapi"
 else
   cat > $TMPC << EOF
 #include <byteswap.h>
-- 
1.6.2.5