From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 26 Apr 2013 18:15:35 +0000 (+0300)
Subject: Fix linking issues with mspnet
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=1d240350c24138e173eac660d31d56c7b8503b09;hp=eb9af366e9561204de69d97b8edd077dc6dc7add;p=r2c2.git

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 30f87b2..11a61c7 100644
--- 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 bf404e9..5b3d419 100644
--- 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 83be2e0..efb3b3a 100644
--- 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();