summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorHadet <dev@example.com>2026-06-03 01:15:48 +0000
committerErik Kundiman <erik@megapahit.org>2026-06-04 09:58:48 +0700
commit4a48c18093f164ac741664554323dccccc213719 (patch)
tree59375cc1b607b30da07e4da14d58402a9868b7c2 /indra/newview/llviewermenu.cpp
parentf73f1bbacd2bd174619f008f61ff2ff0c11b8386 (diff)
llappviewer: gate media version reporting on LL_CEF/LL_VLC, not _M_ARM64
The CEF/Dullahan and libVLC version-reporting blocks were guarded with '#if !_M_ARM64'. _M_ARM64 is an MSVC-only predefined macro: defined only by MSVC when targeting ARM64, never by GCC or Clang. The intent (per the '// !LL_LINUX' comment) was to skip these blocks where the media version headers are unavailable, but the macro only ever excludes MSVC-on-ARM64. On Clang/macOS _M_ARM64 is undefined even on Apple Silicon, so the blocks compiled and failed with: fatal error: 'cef/dullahan_version.h' file not found whenever those headers were not on the include path (a build with ENABLE_MEDIA_PLUGINS off, or any non-MSVC platform lacking the headers). Gate the includes and the two version-string blocks on the LL_CEF / LL_VLC compile definitions emitted by newview/CMakeLists.txt, which track the actual build configuration. The combined include/usage is split so a platform that provides one library but not the other is handled correctly.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
0 files changed, 0 insertions, 0 deletions