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 | f73f1bbacd2bd174619f008f61ff2ff0c11b8386 (patch) | |
| tree | 873dc02245872a51a807000c062de094a510df1f | |
| parent | ff6c1f118a27b91d8a9983056a83642fbecfac8a (diff) | |
newview: emit LL_VLC/LL_CEF compile definitions for media version reporting
The viewer reports the bundled libVLC and CEF/Dullahan versions in the
Help->About info. Whether those version headers are available is a build
configuration fact (ENABLE_MEDIA_PLUGINS, and for CEF the DARWIN/LINUX
condition), not a CPU/compiler property. Emit LL_VLC and LL_CEF compile
definitions that mirror the existing media-plugin link availability so the
source can gate the version-reporting code on the build configuration.
No behavior change on platforms that already link these libraries.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f829286cda..e070fb3da3 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2202,8 +2202,14 @@ endif () if (ENABLE_MEDIA_PLUGINS) target_link_libraries(${VIEWER_BINARY_NAME} ll::libvlc ) + # Tell the viewer source which media-library version headers are + # actually available in this build, so version reporting in + # llappviewer.cpp is gated on the build configuration rather than on + # a CPU/compiler macro. Mirrors the link availability above exactly. + target_compile_definitions(${VIEWER_BINARY_NAME} PRIVATE LL_VLC=1) if (DARWIN OR LINUX) target_link_libraries(${VIEWER_BINARY_NAME} ll::cef ) + target_compile_definitions(${VIEWER_BINARY_NAME} PRIVATE LL_CEF=1) endif () endif () |