Fix linking issues with mspnet

Remote and serial use the resolve function and must link with mspnet
directly.  Adding an empty destructor to server.cpp avoids generating
a default destructor for StreamServerSocket in files that #include
server.h.

diff --git a/Build b/Build
index 30f87b25e50b43230be14ec53dc8c7389515b430..11a61c7b31d368c7f9fa5306592146c85d7562e9 100644 (file)
--- a/Build
+++ b/Build
@@ -60,6 +60,7 @@ package "r2c2"
        {
                source "source/remote";
                require "gtkmm-2.4";
+               require "mspnet";
                use "r2c2";
                use "r2c2_net";
        };
@@ -67,6 +68,7 @@ package "r2c2"
        program "serial"
        {
                source "source/serial";
+               require "mspnet";
                use "r2c2";
                use "r2c2_net";
        };

diff --git a/source/network/server.cpp b/source/network/server.cpp
index bf404e9b5ea90eae6116d7ce5651f7e5b7acf429..5b3d419f2c010cebe4cf10333873759d3c0146d0 100644 (file)
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -34,6 +34,9 @@ Server::Server(Layout &l):
        listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
 }
 
+Server::~Server()
+{ }
+
 void Server::use_event_dispatcher(IO::EventDispatcher &ed)
 {
        event_disp = &ed;

diff --git a/source/network/server.h b/source/network/server.h
index 83be2e044da57b1a05849a74ee0ff38b9fe9829f..efb3b3a2472726ab8bfdce9ac5427c35a9825402 100644 (file)
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -45,6 +45,8 @@ private:
 
 public:
        Server(Layout &);
+       ~Server();
+
        void use_event_dispatcher(Msp::IO::EventDispatcher &);
 private:
        void incoming_connection();