Extended .btg format to support a 'points' primitive.

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 558c7b8c908c0fc11ba8c5bf2b52e941e4e4588d..b00e24459ca9de0809a47df83024efad4476ed24 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -8,7 +8,7 @@ include_HEADERS = \
        sg_binobj.hxx \
        sg_file.hxx \
        sg_serial.hxx \
-       sg_socket.hxx
+       sg_socket.hxx \
        sg_socket_udp.hxx
 
 libsgio_a_SOURCES = \
@@ -20,7 +20,17 @@ 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
 
@@ -47,4 +57,4 @@ decode_binobj_LDADD = \
         $(top_builddir)/simgear/misc/libsgmisc.a \
         $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
-        -lz
+       $(NETWORK_LIB) -lz