MSVC fixes

[simgear.git] / simgear / io / Makefile.am

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index c78df9565d495ee28f38a24d214b7333096beed4..2c869c0a40d925e472e157f3d2665aac5b690484 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -22,12 +22,6 @@ libsgio_a_SOURCES = \
 
 INCLUDES = -I$(top_srcdir)
 
-if IS_MINGW
-NETWORK_LIB = -lwsock32
-else
-NETWORK_LIB =
-endif
-
 noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
@@ -38,7 +32,8 @@ tcp_server_LDADD = \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
-       -lplibnet -lz
+       -lplibnet -lplibul -lz \
+       $(network_LIBS)
 
 tcp_client_SOURCES = tcp_client.cxx
 
@@ -48,7 +43,8 @@ tcp_client_LDADD = \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
         $(top_builddir)/simgear/xml/libsgxml.a \
-       -lplibnet -lz
+       -lplibnet -lplibul -lz \
+       $(network_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
@@ -58,7 +54,8 @@ socktest_LDADD = \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
-       -lplibnet -lz
+       -lplibnet -lplibul -lz \
+       $(network_LIBS)
 
 lowtest_SOURCES = lowtest.cxx
 
@@ -73,4 +70,4 @@ decode_binobj_LDADD = \
         $(top_builddir)/simgear/misc/libsgmisc.a \
         $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
-       $(NETWORK_LIB) -lz
+       -lz