From e1d8155565595c0f886db3042ceea247335f9694 Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 22 Jul 2010 22:04:20 +0100 Subject: [PATCH] Linux build fixes, now netSocket.h is no longer included. --- simgear/io/Makefile.am | 4 ++++ simgear/io/sg_socket.cxx | 2 ++ simgear/io/sg_socket_udp.cxx | 2 ++ 3 files changed, 8 insertions(+) diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am index 1f354897..d61a6165 100644 --- a/simgear/io/Makefile.am +++ b/simgear/io/Makefile.am @@ -30,6 +30,7 @@ tcp_server_SOURCES = tcp_server.cxx tcp_server_LDADD = \ libsgio.a \ + $(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -41,6 +42,7 @@ tcp_client_SOURCES = tcp_client.cxx tcp_client_LDADD = \ libsgio.a \ + $(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -52,6 +54,7 @@ socktest_SOURCES = socktest.cxx socktest_LDADD = \ libsgio.a \ + $(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -63,6 +66,7 @@ lowtest_SOURCES = lowtest.cxx lowtest_LDADD = \ libsgio.a \ + $(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ diff --git a/simgear/io/sg_socket.cxx b/simgear/io/sg_socket.cxx index 14ae2969..636ff345 100644 --- a/simgear/io/sg_socket.cxx +++ b/simgear/io/sg_socket.cxx @@ -28,6 +28,8 @@ #include #include +#include +#include // for atoi #include diff --git a/simgear/io/sg_socket_udp.cxx b/simgear/io/sg_socket_udp.cxx index bdc04d11..2d297154 100644 --- a/simgear/io/sg_socket_udp.cxx +++ b/simgear/io/sg_socket_udp.cxx @@ -30,6 +30,8 @@ #include "sg_socket_udp.hxx" +#include +#include // for atoi SGSocketUDP::SGSocketUDP( const string& host, const string& port ) : hostname(host), -- 2.39.5