Add native macOS (Apple Silicon) support

Support mac-os (apple silicon) target. Step 1 of 2 that results in a native Apple application

Full disclosure - this was built with conjunction with Claude - but not pure vibe coded. I've reviewed and adjusted much of it once I broke the back of the problem. Locally I have a full working app, which will be delivered by a subsequent PR for PathOfBuilding-PoE2.

## Notable Changes (non-exhaustive)

**LuaJIT:**
Bumped to include arm64 mcode_alloc fixes. See: LuaJIT/LuaJIT#285
Without this, the resulting mac build had significant performance issues

**Retina:**
Changed the relevant cursor coordinates to support retina displays. Otherwise mouseclicks, and tooltip rendering windows were being cut off.

**Clang:**
Support for clang compilation, whilst maintaining MSVC

## Verification
Built on OS X 26.5, and on Win. Both result in success and a working application

Author: nelkonandparker

.gitattributes

@@ -0,0 +1 @@
+patches/* -text

CMakeLists.txt

@@ -78,18 +78,18 @@ set(SIMPLEGRAPHIC_SOURCES
 
 set (SIMPLEGRAPHIC_PLATFORM_SOURCES)
 if (APPLE)
-    set (SIMPLEGRAPHIC_PLATFORM_SOURCES
+    list (APPEND SIMPLEGRAPHIC_PLATFORM_SOURCES
         "engine/system/win/sys_macos.mm"
     )
 endif()
 
 if (WIN32)
-    set (SIMPLEGRAPHIC_PLATFORM_SOURCES
+    list (APPEND SIMPLEGRAPHIC_PLATFORM_SOURCES
         "engine/system/win/sys_console.cpp"
         "SimpleGraphic.rc"
     )
 else()
-    set (SIMPLEGRAPHIC_PLATFORM_SOURCES
+    list (APPEND SIMPLEGRAPHIC_PLATFORM_SOURCES
         "engine/system/win/sys_console_unix.cpp"
     )
 endif()
@@ -131,6 +131,12 @@ find_package(zstd REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(WebP)
 
+if (TARGET zstd::libzstd_shared)
+    set(ZSTD_LIBRARY zstd::libzstd_shared)
+else ()
+    set(ZSTD_LIBRARY zstd::libzstd_static)
+endif ()
+
 add_library(cmp_core STATIC
     dep/compressonator/cmp_core/source/cmp_core.cpp
     dep/compressonator/cmp_core/source/cmp_core.h
@@ -240,7 +246,7 @@ target_link_libraries(SimpleGraphic
     Threads::Threads
     WebP::webpdecoder
     ZLIB::ZLIB
-    zstd::libzstd_shared
+    ${ZSTD_LIBRARY}
 )
 
 install(FILES $<TARGET_RUNTIME_DLLS:SimpleGraphic> DESTINATION ".")
@@ -277,6 +283,35 @@ if (WIN32)
 endif ()
 
 
+find_package(Git QUIET)
+if (NOT GIT_EXECUTABLE)
+    set(GIT_EXECUTABLE git)
+endif ()
+
+function(apply_submodule_patch SUBMODULE_DIR PATCH_FILE)
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} -C ${SUBMODULE_DIR} apply --ignore-whitespace --reverse --check ${PATCH_FILE}
+        RESULT_VARIABLE _patch_in_place
+        OUTPUT_QUIET ERROR_QUIET
+    )
+    if (NOT _patch_in_place EQUAL 0)
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} -C ${SUBMODULE_DIR} apply --ignore-whitespace ${PATCH_FILE}
+            RESULT_VARIABLE _patch_result
+        )
+        if (NOT _patch_result EQUAL 0)
+            message(FATAL_ERROR "Failed to apply ${PATCH_FILE}")
+        endif ()
+        message(STATUS "Applied patch: ${PATCH_FILE}")
+    endif ()
+endfunction()
+
+apply_submodule_patch(
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/Lua-cURLv3
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/Lua-cURLv3-skip-luaL_setfuncs-on-luajit.patch
+)
+
+
 # lcurl module
 
 set(LCURL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/Lua-cURLv3)
@@ -301,10 +336,12 @@ install(FILES $<TARGET_RUNTIME_DLLS:lcurl> DESTINATION ".")
 
 add_library(lua-utf8 SHARED libs/luautf8/lutf8lib.c)
 
-target_compile_definitions(lua-utf8
-    PRIVATE
-    LUA_BUILD_AS_DLL
-)
+if (WIN32)
+    target_compile_definitions(lua-utf8
+        PRIVATE
+        LUA_BUILD_AS_DLL
+    )
+endif ()
 
 target_include_directories(lua-utf8
     PRIVATE
@@ -333,9 +370,14 @@ add_library(luasocket SHARED
    "libs/luasocket/src/tcp.c"
    "libs/luasocket/src/timeout.c"
    "libs/luasocket/src/udp.c"
-   "libs/luasocket/src/wsocket.c"
 )
 
+if (WIN32)
+    target_sources(luasocket PRIVATE "libs/luasocket/src/wsocket.c")
+else ()
+    target_sources(luasocket PRIVATE "libs/luasocket/src/usocket.c")
+endif ()
+
 target_include_directories(luasocket
     PRIVATE
     ${LSOCKET_SOURCE_DIR}/src
@@ -344,10 +386,12 @@ target_include_directories(luasocket
 target_link_libraries(luasocket
     PRIVATE
     LuaJIT::LuaJIT
-    wsock32
-    ws2_32
 )
 
+if (WIN32)
+    target_link_libraries(luasocket PRIVATE wsock32 ws2_32)
+endif ()
+
 set_target_properties( luasocket PROPERTIES OUTPUT_NAME "socket" ) 
 install(TARGETS luasocket RUNTIME DESTINATION ".")
 install(FILES $<TARGET_RUNTIME_DLLS:luasocket> DESTINATION ".")

cmake/FindLuaJIT.cmake

@@ -9,15 +9,15 @@ if (DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
 
     find_path(LuaJIT_INCLUDE_DIR luajit.h
         PATHS ${LuaJIT_SEARCH_ROOT}/include
-        PATH_SUFFIXES luajit
+        PATH_SUFFIXES luajit luajit-2.0 luajit-2.1
         NO_DEFAULT_PATH)
 
-    find_library(LuaJIT_LIBRARY_RELEASE NAMES lua51
+    find_library(LuaJIT_LIBRARY_RELEASE NAMES lua51 luajit-5.1
         PATHS ${LuaJIT_SEARCH_ROOT}
         PATH_SUFFIXES lib
         NO_DEFAULT_PATH)
 
-    find_library(LuaJIT_LIBRARY_DEBUG NAMES lua51
+    find_library(LuaJIT_LIBRARY_DEBUG NAMES lua51 luajit-5.1
         PATHS ${LuaJIT_SEARCH_ROOT}
         PATH_SUFFIXES debug/lib
         NO_DEFAULT_PATH)

engine/common/base64.c

@@ -29,6 +29,7 @@
 #include "base64.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 /* ---- Base64 Encoding/Decoding Table --- */
 /* Padding character string starts at offset 64. */

engine/common/base64.h

@@ -26,6 +26,7 @@
 // Modified for standalone inclusion in SimpleGraphic.
 
 #include <stdbool.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

engine/common/common.cpp

@@ -437,6 +437,8 @@ char* NarrowUTF8String(const wchar_t* str)
 	return NarrowCodepageString(str, CP_UTF8);
 }
 
+#endif
+
 IndexedUTF32String IndexUTF8ToUTF32(std::string_view input)
 {
 	IndexedUTF32String ret{};
@@ -500,5 +502,3 @@ IndexedUTF32String IndexUTF8ToUTF32(std::string_view input)
 	ret.text = std::u32string(codepoints.begin(), codepoints.end());
 	return ret;
 }
-
-#endif

engine/render/r_font.cpp

@@ -321,7 +321,7 @@ r_font_c::FontHeightEntry r_font_c::FindFontHeight(int height) {
 void r_font_c::DrawTextLine(scp_t pos, int align, int height, col4_t col, std::u32string_view str)
 {
 	// Check if the line is visible
-	if (pos[Y] >= renderer->sys->video->vid.size[1] || pos[Y] <= -height) {
+	if (pos[Y] >= renderer->VirtualScreenHeight() || pos[Y] <= -height) {
 		// Just process the colour codes
 		while (!str.empty()) {
 			// Check for escape character

engine/render/r_main.cpp

@@ -12,6 +12,8 @@
 
 #include <algorithm>
 #include <array>
+#include <chrono>
+#include <thread>
 #include <filesystem>
 #include <fmt/chrono.h>
 #include <future>
@@ -1640,7 +1642,7 @@ void r_renderer_c::GetShaderImageSize(r_shaderHnd_c* hnd, int& width, int& heigh
 	if (hnd)
 	{
 		while (hnd->sh->tex->status < r_tex_c::SIZE_KNOWN) {
-			Sleep(1);
+			std::this_thread::sleep_for(std::chrono::milliseconds(1));
 		}
 		width = hnd->sh->tex->fileWidth;
 		height = hnd->sh->tex->fileHeight;

engine/render/r_texture.cpp

@@ -7,6 +7,7 @@
 #include <mutex>
 #include <vector>
 #include <atomic>
+#include <thread>
 #include "r_local.h"
 
 #include "cmp_core.h"
@@ -504,7 +505,7 @@ static gli::texture2d_array TranscodeTexture(gli::texture2d_array src, gli::form
 
 			for (size_t blockRow = 0; blockRow < srcBlocksPerRow; ++blockRow) {
 				const size_t rowBase = blockRow * srcBlockSize.y;
-				const size_t rowsLeft = (std::min)(4ull, dstExtent.y - rowBase);
+				const size_t rowsLeft = (std::min)(size_t(4),dstExtent.y - rowBase);
 
 				for (size_t blockCol = 0; blockCol < srcBlocksPerColumn; ++blockCol) {
 					// Read source 4x4 texel block, no branching needed.
@@ -524,7 +525,7 @@ static gli::texture2d_array TranscodeTexture(gli::texture2d_array src, gli::form
 
 						// Here we work off that dstData points at the top left pixel of the block row in the destination.
 						const size_t colBase = blockCol * srcBlockSize.x;
-						const size_t colsLeft = (std::min)(4ull, dstExtent.x - colBase);
+						const size_t colsLeft = (std::min)(size_t(4),dstExtent.x - colBase);
 						const size_t colBytesLeft = colsLeft * 4;
 						for (size_t innerRow = 0; innerRow < rowsLeft; ++innerRow) {
 							auto* dstPtr = dstData + dstRowStride * innerRow + colBase * 4;

engine/system/win/sys_video.cpp

@@ -115,6 +115,8 @@ sys_video_c::sys_video_c(sys_IMain* sysHnd)
 		platformType = GLFW_ANGLE_PLATFORM_TYPE_D3D11;
 	else // Native Windows
 		platformType = GLFW_ANGLE_PLATFORM_TYPE_D3D11;
+#elif defined(__APPLE__)
+	platformType = GLFW_ANGLE_PLATFORM_TYPE_METAL;
 #endif
 	glfwInitHint(GLFW_ANGLE_PLATFORM_TYPE, platformType);
 	glfwInit();
@@ -489,7 +491,9 @@ int sys_video_c::Apply(sys_vidSet_s* set)
 				return;
 			}
 			auto video = (sys_video_c*)sys->video;
-			video->lastCursorPos = CursorPos{ (int)x, (int)y };
+			double sx = video->vid.size[0] > 0 ? (double)video->vid.fbSize[0] / video->vid.size[0] : 1.0;
+			double sy = video->vid.size[1] > 0 ? (double)video->vid.fbSize[1] / video->vid.size[1] : 1.0;
+			video->lastCursorPos = CursorPos{ (int)(x * sx), (int)(y * sy) };
 			});
 		glfwSetWindowCloseCallback(wnd, [](GLFWwindow* wnd) {
 			auto sys = (sys_main_c*)glfwGetWindowUserPointer(wnd);
@@ -737,14 +741,18 @@ void sys_video_c::GetRelativeCursor(int& x, int& y)
 	if (!initialised) return;
 	double xpos, ypos;
 	glfwGetCursorPos(wnd, &xpos, &ypos);
-	x = (int)floor(xpos);
-	y = (int)floor(ypos);
+	double sx = vid.size[0] > 0 ? (double)vid.fbSize[0] / vid.size[0] : 1.0;
+	double sy = vid.size[1] > 0 ? (double)vid.fbSize[1] / vid.size[1] : 1.0;
+	x = (int)floor(xpos * sx);
+	y = (int)floor(ypos * sy);
 }
 
 void sys_video_c::SetRelativeCursor(int x, int y)
 {
 	if (!initialised) return;
-	glfwSetCursorPos(wnd, (double)x, (double)y);
+	double sx = vid.fbSize[0] > 0 ? (double)vid.size[0] / vid.fbSize[0] : 1.0;
+	double sy = vid.fbSize[1] > 0 ? (double)vid.size[1] / vid.fbSize[1] : 1.0;
+	glfwSetCursorPos(wnd, x * sx, y * sy);
 }
 
 bool sys_video_c::IsCursorOverWindow()