#5346: Linux compilation fixes.

Remove libtool-generated file.

include/imodule.h

@@ -340,50 +340,6 @@ namespace module
      * \ingroup module
      */
 
-	// Reference container to hold the cached module references.
-	// It automatically invalidates its reference as soon as the IModuleRegistry
-	// changes its instance ID.
-	template<typename ModuleType>
-	class InstanceReference
-	{
-	private:
-		const char* const _moduleName;
-		ModuleType* _instancePtr;
-		IModuleRegistry::InstanceId _registryInstanceId;
-	public:
-		InstanceReference(const char* const moduleName) :
-			_moduleName(moduleName),
-			_instancePtr(nullptr),
-			_registryInstanceId(0)
-		{
-			acquireReference();
-		}
-
-		// Cast-operator used to access the module reference
-		inline operator ModuleType&()
-		{
-#ifdef MODULE_REFERENCES_SUPPORT_INVALIDATION
-			// Check if we have an instance or if it is outdated
-			if (_instancePtr == nullptr ||
-				_registryInstanceId != GlobalModuleRegistry().getInstanceId())
-			{
-				acquireReference();
-			}
-#endif
-			return *_instancePtr;
-		}
-
-	private:
-		void acquireReference()
-		{
-			_instancePtr = std::dynamic_pointer_cast<ModuleType>(
-				GlobalModuleRegistry().getModule(_moduleName)).get();
-			// Save the instance ID of the registry - if this ever changes 
-			// the above reference is treated as invalid
-			_registryInstanceId = GlobalModuleRegistry().getInstanceId();
-		}
-	};
-
 	/** greebo: This is a container holding a reference to the registry.
 	 *          The getRegistry() symbol above is not exported to the
 	 *          modules in Win32 compiles. That's why this structure
@@ -436,6 +392,50 @@ namespace module
 		return !RegistryReference::Instance().isEmpty();
 	}
 
+	// Reference container to hold the cached module references.
+	// It automatically invalidates its reference as soon as the IModuleRegistry
+	// changes its instance ID.
+	template<typename ModuleType>
+	class InstanceReference
+	{
+	private:
+		const char* const _moduleName;
+		ModuleType* _instancePtr;
+		IModuleRegistry::InstanceId _registryInstanceId;
+	public:
+		InstanceReference(const char* const moduleName) :
+			_moduleName(moduleName),
+			_instancePtr(nullptr),
+			_registryInstanceId(0)
+		{
+			acquireReference();
+		}
+
+		// Cast-operator used to access the module reference
+		inline operator ModuleType&()
+		{
+#ifdef MODULE_REFERENCES_SUPPORT_INVALIDATION
+			// Check if we have an instance or if it is outdated
+			if (_instancePtr == nullptr ||
+				_registryInstanceId != GlobalModuleRegistry().getInstanceId())
+			{
+				acquireReference();
+			}
+#endif
+			return *_instancePtr;
+		}
+
+	private:
+		void acquireReference()
+		{
+			_instancePtr = std::dynamic_pointer_cast<ModuleType>(
+				GlobalModuleRegistry().getModule(_moduleName)).get();
+			// Save the instance ID of the registry - if this ever changes 
+			// the above reference is treated as invalid
+			_registryInstanceId = GlobalModuleRegistry().getInstanceId();
+		}
+	};
+
 	// Exception thrown if the module being loaded is incompatible with the main binary
 	class ModuleCompatibilityException : 
 		public std::runtime_error

libs/module/ApplicationContextBase.cpp

@@ -128,6 +128,8 @@ const IApplicationContext::ArgumentList& ApplicationContextBase::getCmdLineArgs(
 #include <stdlib.h>
 #include <pwd.h>
 #include <unistd.h>
+#include <limits.h>
+
 #ifdef __APPLE__
 #include <libproc.h>
 #endif
@@ -240,7 +242,7 @@ std::string getXDGPath(const std::string& envVar, const std::string& fallback)
 
 } // namespace
 
-void ApplicationContextImpl::initialise(int argc, char* argv[])
+void ApplicationContextBase::initialise(int argc, char* argv[])
 {
     // Give away unnecessary root privileges.
     // Important: must be done before calling gtk_init().

plugins/dm.gameconnection/clsocket/PassiveSocket.cpp

@@ -216,7 +216,7 @@ CActiveSocket *CPassiveSocket::Accept()
 {
     uint32         nSockLen;
     CActiveSocket *pClientSocket = NULL;
-    SOCKET         socket = UINT_PTR(CSimpleSocket::SocketError);
+    SOCKET         socket{CSimpleSocket::SocketError};
 
     if (m_nSocketType != CSimpleSocket::SocketTypeTcp)
     {

radiant/Makefile.am

@@ -192,7 +192,6 @@ darkradiant_SOURCES = main.cpp \
                       textool/item/PatchItem.cpp \
                       textool/item/PatchVertexItem.cpp \
                       textool/TexTool.cpp \
-                      modulesystem/ApplicationContextImpl.cpp \
                       selection/ManipulateMouseTool.cpp \
                       selection/SelectionMouseTools.cpp \
                       settings/Win32Registry.cpp \

radiant/camera/tools/JumpToObjectTool.h

@@ -7,6 +7,8 @@
 #include "../GlobalCameraWndManager.h"
 #include "ObjectFinder.h"
 
+#include "math/AABB.h"
+
 namespace ui
 {
 

radiant/eventmanager/MouseToolManager.cpp

@@ -4,6 +4,8 @@
 #include "iuimanager.h"
 #include "iregistry.h"
 #include "itextstream.h"
+#include "imainframe.h"
+
 #include "string/convert.h"
 #include "string/join.h"
 #include "wxutil/MouseButton.h"

radiant/ui/DispatchEvent.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <wx/event.h>
+#include <functional>
 
 namespace ui
 {

radiant/ui/ManipulatorToggle.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include "iselection.h"
+#include "ieventmanager.h"
+#include "iclipper.h"
+
 #include <sigc++/connection.h>
 
 namespace ui

radiant/ui/overlay/Overlay.cpp

@@ -1,5 +1,7 @@
 #include "Overlay.h"
 
+#include "imainframe.h"
+
 #include "registry/registry.h"
 #include "math/Vector3.h"
 #include "math/Matrix4.h"

radiant/ui/script/ScriptMenu.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 namespace ui
 {