From a20055449630f02c73a2dc150ff4fd17110d763e Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Thu, 19 Oct 2023 11:45:25 +0100
Subject: [PATCH] more changes

-Apple = more trouble than its worth
---
 Tools/CMake/torqueMacOSconfigs.cmake | 16 +++++++++++++++-
 Tools/CMake/torque_macros.cmake      | 17 -----------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Tools/CMake/torqueMacOSconfigs.cmake b/Tools/CMake/torqueMacOSconfigs.cmake
index 3d19ffc76..fca739680 100644
--- a/Tools/CMake/torqueMacOSconfigs.cmake
+++ b/Tools/CMake/torqueMacOSconfigs.cmake
@@ -105,4 +105,18 @@ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names
 set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
 set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
-set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
\ No newline at end of file
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
+
+if(CMAKE_OSX_ARCHITECTURES MATCHES "((^|;|, )(arm64|arm64e|x86_64))+")
+  set(CMAKE_C_SIZEOF_DATA_PTR 8)
+  set(CMAKE_CXX_SIZEOF_DATA_PTR 8)
+  if(CMAKE_OSX_ARCHITECTURES MATCHES "((^|;|, )(arm64|arm64e))+")
+    set(CMAKE_SYSTEM_PROCESSOR "aarch64")
+  else()
+    set(CMAKE_SYSTEM_PROCESSOR "x86_64")
+  endif()
+else()
+  set(CMAKE_C_SIZEOF_DATA_PTR 4)
+  set(CMAKE_CXX_SIZEOF_DATA_PTR 4)
+  set(CMAKE_SYSTEM_PROCESSOR "arm")
+endif()
\ No newline at end of file
diff --git a/Tools/CMake/torque_macros.cmake b/Tools/CMake/torque_macros.cmake
index 6783c7671..04371ca6c 100644
--- a/Tools/CMake/torque_macros.cmake
+++ b/Tools/CMake/torque_macros.cmake
@@ -65,23 +65,6 @@ macro (torqueAddSourceDirectories)
   endforeach()
 endmacro (torqueAddSourceDirectories)
 
-# Helper function to add a directory to the TORQUE_SOURCE_FILES variable. It automatically searches for .cpp and .h files in the
-# specified directory then adds them to the TORQUE_SOURCE_FILES variable.
-macro (torqueToolchainSourceDirectories)
-  foreach(ARGUMENT ${ARGV})
-    file(GLOB SCANNED_SOURCE_FILES "${TORQUE_SOURCE_DIRECTROY}/${ARGUMENT}/*.cpp")
-    file(GLOB SCANNED_INCLUDE_FILES "${TORQUE_SOURCE_DIRECTROY}/${ARGUMENT}/*.h")
-
-    if (APPLE)
-      file(GLOB SCANNED_MAC_FILES "${TORQUE_SOURCE_DIRECTROY}/${ARGUMENT}/*.mm")
-    endif (APPLE)
-
-    # Set in both current and parent scope so this macro can be used from loaded modules
-    set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${SCANNED_SOURCE_FILES} ${SCANNED_INCLUDE_FILES} ${SCANNED_MAC_FILES})
-    set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} PARENT_SCOPE)
-  endforeach()
-endmacro (torqueToolchainSourceDirectories)
-
 ################# Set Conditional Engine Defines ###################
 macro (forwardDef flag)
     if (${flag})