diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-21 17:40:58 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-27 15:11:17 +0800 |
| commit | 161935f3178f343848839ad93ccaa6c1988bdef6 (patch) | |
| tree | a8ce522cef705028801c63ca6f2d088a9c245f59 /indra/llxml | |
| parent | d9325eb964d07edb773dee23f196452874ea2b62 (diff) | |
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.
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llxmlnode.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 <iostream> #include <map> +#if LL_SDL #include <SDL_rwops.h> +#endif #include "llxmlnode.h" |