From 247b12e79549e78e270050a766701ef00e011f78 Mon Sep 17 00:00:00 2001
From: Robert MacGregor <ragoradev@gmail.com>
Date: Sun, 14 Nov 2021 14:45:42 -0500
Subject: [PATCH] * BugFix: Correct many include paths and build platformX11 on
 non-Apple Unix.

---
 Engine/source/platformPOSIX/POSIXCPUInfo.cpp        |  2 +-
 Engine/source/platformPOSIX/POSIXFileio.cpp         |  4 +---
 Engine/source/platformPOSIX/POSIXMain.cpp           |  2 +-
 Engine/source/platformPOSIX/POSIXProcessControl.cpp |  2 +-
 Engine/source/platformPOSIX/POSIXTime.cpp           |  2 +-
 Engine/source/platformX11/X11Font.client.cpp        |  4 ++--
 Tools/CMake/torque3d.cmake                          | 10 +++++++---
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Engine/source/platformPOSIX/POSIXCPUInfo.cpp b/Engine/source/platformPOSIX/POSIXCPUInfo.cpp
index 33b79425e..279d23f1a 100644
--- a/Engine/source/platformPOSIX/POSIXCPUInfo.cpp
+++ b/Engine/source/platformPOSIX/POSIXCPUInfo.cpp
@@ -23,7 +23,7 @@
 #ifndef __APPLE__
 
 #include "platform/platform.h"
-#include "platformX86UNIX/platformX86UNIX.h"
+#include "platformPOSIX/platformPOSIX.h"
 #include "console/console.h"
 #include "core/stringTable.h"
 #include "core/strings/stringFunctions.h"
diff --git a/Engine/source/platformPOSIX/POSIXFileio.cpp b/Engine/source/platformPOSIX/POSIXFileio.cpp
index a9e6a7046..c21e427ba 100644
--- a/Engine/source/platformPOSIX/POSIXFileio.cpp
+++ b/Engine/source/platformPOSIX/POSIXFileio.cpp
@@ -151,7 +151,7 @@ bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredA
 #undef Status
 #endif
 
-#include "platformX86UNIX/platformX86UNIX.h"
+#include "platformPOSIX/platformPOSIX.h"
 
 extern int x86UNIXOpen(const char *path, int oflag);
 extern int x86UNIXClose(int fd);
@@ -159,8 +159,6 @@ extern ssize_t x86UNIXRead(int fd, void *buf, size_t nbytes);
 extern ssize_t x86UNIXWrite(int fd, const void *buf, size_t nbytes);
 extern bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredAbsolute);
 
-const int MaxPath = PATH_MAX;
-
 namespace
 {
     const char sTempDir[] = "/tmp/";
diff --git a/Engine/source/platformPOSIX/POSIXMain.cpp b/Engine/source/platformPOSIX/POSIXMain.cpp
index dda611967..3e873a27b 100644
--- a/Engine/source/platformPOSIX/POSIXMain.cpp
+++ b/Engine/source/platformPOSIX/POSIXMain.cpp
@@ -26,7 +26,7 @@
 #include "platform/platformInput.h"
 #include "console/console.h"
 
-#include "platformX86UNIX/platformX86UNIX.h"
+#include "platformPOSIX/platformPOSIX.h"
 #include "platformPOSIX/POSIXStdConsole.h"
 #include "platformPOSIX/POSIXState.h"
 
diff --git a/Engine/source/platformPOSIX/POSIXProcessControl.cpp b/Engine/source/platformPOSIX/POSIXProcessControl.cpp
index 0d8725d0b..745240dd5 100644
--- a/Engine/source/platformPOSIX/POSIXProcessControl.cpp
+++ b/Engine/source/platformPOSIX/POSIXProcessControl.cpp
@@ -22,7 +22,7 @@
 
 #ifndef __APPLE__
 
-#include "platformX86UNIX/platformX86UNIX.h"
+#include "platformPOSIX/platformPOSIX.h"
 #include "platformPOSIX/POSIXState.h"
 #include "platformPOSIX/POSIXStdConsole.h"
 #include "platform/platformInput.h"
diff --git a/Engine/source/platformPOSIX/POSIXTime.cpp b/Engine/source/platformPOSIX/POSIXTime.cpp
index 15d733389..2519b479f 100644
--- a/Engine/source/platformPOSIX/POSIXTime.cpp
+++ b/Engine/source/platformPOSIX/POSIXTime.cpp
@@ -22,7 +22,7 @@
 
 #ifndef __APPLE__
 
-#include "platformX86UNIX/platformX86UNIX.h"
+#include "platformPOSIX/platformPOSIX.h"
 #include "platform/platformTimer.h"
 #include "time.h"
 #include <errno.h>
diff --git a/Engine/source/platformX11/X11Font.client.cpp b/Engine/source/platformX11/X11Font.client.cpp
index 402392c9a..2cdfbacac 100644
--- a/Engine/source/platformX11/X11Font.client.cpp
+++ b/Engine/source/platformX11/X11Font.client.cpp
@@ -26,8 +26,8 @@
 #include "console/console.h"
 #include "core/strings/unicode.h"
 #include "core/stringTable.h"
-#include "platformX86UNIX/platformX86UNIX.h"
-#include "platformX86UNIX/x86UNIXFont.h"
+#include "platformPOSIX/platformPOSIX.h"
+#include "platformX11/X11Font.h"
 
 // Needed by createFont
 #include <X11/Xlib.h>
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
index eadc2673a..759e64f01 100644
--- a/Tools/CMake/torque3d.cmake
+++ b/Tools/CMake/torque3d.cmake
@@ -80,7 +80,7 @@ if(WIN32)
     set(ALSOFT_INSTALL_HRTF_DATA OFF CACHE BOOL "Install HRTF definition files" FORCE)
     set(ALSOFT_INSTALL_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
     set(ALSOFT_EMBED_HRTF_DATA OFF CACHE BOOL "Embed the HRTF data (increases library footprint)" FORCE)
-    
+
     add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
 endif()
 
@@ -241,7 +241,7 @@ if(WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
     # warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
-	if(TORQUE_SFX_DirectX) 
+	if(TORQUE_SFX_DirectX)
 		if( TORQUE_CPU_X64 )
 			link_directories($ENV{DXSDK_DIR}/Lib/x64)
 		else()
@@ -599,11 +599,15 @@ if(APPLE)
     addPath("${srcDir}/platformPOSIX")
 endif()
 
+if (UNIX AND NOT APPLE)
+    addPath("${srcDir}/platformX11")
+endif()
+
 if(UNIX AND NOT APPLE)
     # linux_dedicated
     if(TORQUE_DEDICATED)
 		addPath("${srcDir}/windowManager/dedicated")
-		# ${srcDir}/platformX86UNIX/*.client.* files are not needed
+		# ${srcDir}/UNIX/*.client.* files are not needed
 		# @todo: move to separate file
 		file( GLOB tmp_files
              ${srcDir}/platformX86UNIX/*.cpp