diff options
| author | Hadet <dev@example.com> | 2026-06-03 01:15:48 +0000 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-06-04 09:58:48 +0700 |
| commit | 4a48c18093f164ac741664554323dccccc213719 (patch) | |
| tree | 59375cc1b607b30da07e4da14d58402a9868b7c2 /indra/newview/llappviewer.cpp | |
| parent | f73f1bbacd2bd174619f008f61ff2ff0c11b8386 (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/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c74c0db08c..719447b920 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -136,10 +136,12 @@ #include "stringize.h" #include "llcoros.h" #include "llexception.h" -#if !_M_ARM64 // !LL_LINUX +#if defined(LL_CEF) #include "cef/dullahan_version.h" +#endif +#if defined(LL_VLC) #include "vlc/libvlc_version.h" -#endif // LL_LINUX +#endif #if LL_DARWIN #if LL_SDL @@ -3517,7 +3519,7 @@ LLSD LLAppViewer::getViewerInfo() const info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); } -#if !_M_ARM64 // !LL_LINUX +#if defined(LL_CEF) std::ostringstream cef_ver_codec; cef_ver_codec << "Dullahan: "; cef_ver_codec << DULLAHAN_VERSION_MAJOR; @@ -3547,7 +3549,7 @@ LLSD LLAppViewer::getViewerInfo() const info["LIBCEF_VERSION"] = "Undefined"; #endif -#if !_M_ARM64 // !LL_LINUX +#if defined(LL_VLC) std::ostringstream vlc_ver_codec; vlc_ver_codec << LIBVLC_VERSION_MAJOR; vlc_ver_codec << "."; |