diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-23 22:42:16 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-23 22:46:17 +0800 |
| commit | 3da3b4c0827d9f47ff073f5b25ab430c05e49899 (patch) | |
| tree | 39218618d671751646d82d9164104b342d983979 /indra/media_plugins | |
| parent | 3518e8a432e826f62e598e6af43ab388d57b53a2 (diff) | |
Revert "Links to some system libs & bundle some others for CEF"
This reverts commit 3441a57e91f607b8beaa12424bcf71117cedade2.
Also includes both libGLESv2.so & libvulkan.so.1 to the stripping
part. Also reorder the list alphabetically (and case-ically).
Presence of libGLESv2.so on the system isn't mandatory any more
now on Debian/Ubuntu.
This fixes the WebGL being disabled on affected distros.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index ee9a709c1e..1a4d61616c 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -194,9 +194,11 @@ if (INSTALL) if (NOT (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES fedora))) install( FILES + ${ARCH_PREBUILT_DIRS_RELEASE}/libEGL.so + ${ARCH_PREBUILT_DIRS_RELEASE}/libGLESv2.so ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.so ${ARCH_PREBUILT_DIRS_RELEASE}/libvk_swiftshader.so - ${ARCH_PREBUILT_DIRS_RELEASE}/libEGL.so + ${ARCH_PREBUILT_DIRS_RELEASE}/libvulkan.so.1 ${ARCH_PREBUILT_DIRS_RELEASE}/v8_context_snapshot.bin ${ARCH_PREBUILT_DIRS_RELEASE}/vk_swiftshader_icd.json ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak @@ -209,32 +211,6 @@ if (INSTALL) DIRECTORY ${AUTOBUILD_INSTALL_DIR}/resources/locales DESTINATION ${_LIB} ) - if (USE_FLATPAK) - install( - FILES - ${ARCH_PREBUILT_DIRS_RELEASE}/libGLESv2.so - ${ARCH_PREBUILT_DIRS_RELEASE}/libvulkan.so.1 - DESTINATION ${_LIB} - ) - else () - file(MAKE_DIRECTORY ${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}) - file(CREATE_LINK - "../libGLESv2.so" - "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libGLESv2.so" - SYMBOLIC - ) - file(CREATE_LINK - "../libvulkan.so.1" - "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libvulkan.so.1" - SYMBOLIC - ) - install( - FILES - ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libGLESv2.so - ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libvulkan.so.1 - DESTINATION ${_LIB} - ) - endif () endif () elseif (WINDOWS) set(_LIB llplugin) |