From 161935f3178f343848839ad93ccaa6c1988bdef6 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 21 Jun 2024 17:40:58 +0800 Subject: Revert to using Cocoa instead of SDL2 for macOS Our SDL2-based code is kept Darwin-ready. This move was triggered by the merge with SLv's release/maint-b branch causing the viewer to show only a black screen, even though everything else seemed to be working (logging in, streaming, quitting the app). This decision also has caused numerous MPv specific window-related macOS bugs to be fixed. I wanted to commit this on the main branch, but somehow it failed to build. This move was bound to happen at the arrival of Maintenance B after all. --- indra/llxml/llxmlnode.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llxml') diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index df27f16ea1..d1c800dc7d 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -29,7 +29,9 @@ #include #include +#if LL_SDL #include +#endif #include "llxmlnode.h" -- cgit v1.2.3