MSVC fixes

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 599d17e05a41e9a4b1167ba42ae5cd9e386e2cf9..2c869c0a40d925e472e157f3d2665aac5b690484 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -20,19 +20,31 @@ libsgio_a_SOURCES = \
        sg_socket.cxx \
        sg_socket_udp.cxx 
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif
 
-if IS_MINGW
-NETWORK_LIB = -lwsock32
-else
-NETWORK_LIB =
-endif
+noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
-noinst_PROGRAMS = decode_binobj socktest lowtest
+tcp_server_SOURCES = tcp_server.cxx
+
+tcp_server_LDADD = \
+       $(top_builddir)/simgear/io/libsgio.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(top_builddir)/simgear/xml/libsgxml.a \
+       -lplibnet -lplibul -lz \
+       $(network_LIBS)
+
+tcp_client_SOURCES = tcp_client.cxx
+
+tcp_client_LDADD = \
+       $(top_builddir)/simgear/io/libsgio.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+        $(top_builddir)/simgear/xml/libsgxml.a \
+       -lplibnet -lplibul -lz \
+       $(network_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
@@ -42,7 +54,8 @@ socktest_LDADD = \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
-       -lz
+       -lplibnet -lplibul -lz \
+       $(network_LIBS)
 
 lowtest_SOURCES = lowtest.cxx
 
@@ -57,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