Merge branch 'develop'

Source/DisplayCluster/DisplayCluster.Build.cs

@@ -129,12 +129,12 @@ public class DisplayCluster : ModuleRules
 		}
 		else if (ROTargetRules.Platform == UnrealTargetPlatform.Linux)
 		{
-			string LibrariesPath = Path.Combine(ThirdPartyPath, "VRPN", "Lib/Linux");
+			string LibrariesPath = Path.Combine(ThirdPartyPath, "Vrpn", "Lib/Linux");
 			
-			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libvrpn.lib"));
-			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libquat.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libvrpn.a"));
+			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libquat.a"));
 			
-			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "VRPN", "Include"));
+			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "Vrpn", "Include"));
 			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "X11", "Include")); // Necessary for hardware swap sync.
 			
 			return true;

ThirdParty/X11/Include/X11/X.h

@@ -111,10 +111,6 @@ typedef unsigned char KeyCode;
  * RESERVED RESOURCE AND CONSTANT DEFINITIONS
  *****************************************************************/
 
-#ifndef None
-#define None                 0L	/* universal null resource or null atom */
-#endif
-
 #define ParentRelative       1L	/* background pixmap in CreateWindow
 				    and ChangeWindowAttributes */
 
@@ -136,8 +132,6 @@ typedef unsigned char KeyCode;
 
 #define AllTemporary         0L	/* special Resource ID passed to KillClient */
 
-#define CurrentTime          0L	/* special Time */
-
 #define NoSymbol	     0L	/* special KeySym */
 
 /*****************************************************************