#5346: Partially apply 88085f5 and 954dd4405d8a558b22c11622c23f7d8f63…

…4191c6from orbweaver/master.

- Move GameConnection into a separate plugin
- Add missing clsocket files to gameconnection plugin Makefile.am

configure.ac

@@ -90,13 +90,15 @@ then
     conv_plugin="dm.conversation"
     gui_plugin="dm.gui"
     editing_plugin="dm.editing"
+	gameconn_plugin="dm.gameconnection"
 fi
 AC_SUBST([sr_plugin])
 AC_SUBST([obj_plugin])
 AC_SUBST([difficulty_plugin])
 AC_SUBST([conv_plugin])
 AC_SUBST([gui_plugin])
 AC_SUBST([editing_plugin])
+AC_SUBST([gameconn_plugin])
 
 # Check for required libraries
 
@@ -375,6 +377,7 @@ AC_CONFIG_FILES([install/darkradiant.desktop install/i18n//Makefile.in
                  plugins/dm.difficulty/Makefile
                  plugins/dm.gui/Makefile
                  plugins/dm.editing/Makefile
+				 plugins/dm.gameconnection/Makefile
                  plugins/dm.conversation/Makefile])
 
 AC_OUTPUT

plugins/Makefile.am

@@ -9,4 +9,5 @@ SUBDIRS += @sr_plugin@ \
            @difficulty_plugin@ \
            @conv_plugin@ \
            @gui_plugin@ \
-           @editing_plugin@
+           @editing_plugin@ \
+           @gameconn_plugin@

plugins/dm.gameconnection/Makefile.am

@@ -0,0 +1,15 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs
+
+pluginsdir = $(pkglibdir)/plugins
+plugins_LTLIBRARIES = dm_gameconnection.la
+
+dm_gameconnection_la_LIBADD = $(top_builddir)/libs/wxutil/libwxutil.la \
+      						  $(top_builddir)/libs/xmlutil/libxmlutil.la
+dm_gameconnection_la_LDFLAGS = -module -avoid-version $(WX_LIBS) $(XML_LIBS)
+dm_gameconnection_la_SOURCES = DiffDoom3MapWriter.cpp \
+                               GameConnection.cpp \
+                               MapObserver.cpp \
+                               MessageTcp.cpp \
+                               clsocket/ActiveSocket.cpp \
+                               clsocket/PassiveSocket.cpp \
+                               clsocket/SimpleSocket.cpp

radiant/Makefile.am

@@ -53,13 +53,6 @@ darkradiant_SOURCES = main.cpp \
                       eventmanager/Statement.cpp \
                       eventmanager/Toggle.cpp \
                       eventmanager/WidgetToggle.cpp \
-                      gameconnection/DiffDoom3MapWriter.cpp \
-                      gameconnection/GameConnection.cpp \
-                      gameconnection/MapObserver.cpp \
-                      gameconnection/MessageTcp.cpp \
-                      gameconnection/clsocket/ActiveSocket.cpp \
-                      gameconnection/clsocket/PassiveSocket.cpp \
-                      gameconnection/clsocket/SimpleSocket.cpp \
                       render/OpenGLModule.cpp \
 					  ui/UserInterfaceModule.cpp \
                       ui/Documentation.cpp \

radiant/ui/UserInterfaceModule.cpp

@@ -382,8 +382,7 @@ void UserInterfaceModule::registerUICommands()
 
 	GlobalCommandSystem().addCommand("RefreshShaders",
 		std::bind(&UserInterfaceModule::refreshShadersCmd, this, std::placeholders::_1));
-    // FIXME: should not dynamic_cast, required methods should be in the
-    // IGameConnection interface
+
 	if (IGameConnection *gameconn = GlobalGameConnection()) {
 		GlobalCommandSystem().addCommand("GameConnectionCameraSyncEnable",
 			[gameconn](const cmd::ArgumentList&) { gameconn->setCameraSyncEnabled(true); });