diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-06-01 08:58:57 +0700 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-06-01 08:58:57 +0700 |
| commit | ae056a279979ae3f051bfaacbdeec162ddc039d9 (patch) | |
| tree | 8dd75bbaded87bf2b4f101234640354d4dbd9f2b | |
| parent | 56809d4eedd6f83ae5f018d8be9fb4234ef46224 (diff) | |
Revert "Preload CEF automatically on Linux aarch64""
This reverts commit 16d3d725998f1189083c429a1cbb2cc3fb15b7da.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3ab162aabf..f829286cda 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -50,9 +50,6 @@ include(VisualLeakDetector) #include(VulkanGltf) include(ZLIBNG) include(LLPrimitive) -if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) - include(UnixInstall) -endif () if (ENABLE_MEDIA_PLUGINS) include(LibVLCPlugin) @@ -1534,7 +1531,6 @@ if (NOT (DARWIN OR WINDOWS)) llappviewerlinux.cpp PROPERTIES COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" - COMPILE_FLAGS "-DAPP_PLUGIN_DIR=\\\"${INSTALL_LIBRARY_DIR}\\\"" ) #LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp) if (NOT CMAKE_CXX_COMPILER_ID MATCHES AppleClang) diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 5bbaed750c..728a8ef81e 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -131,16 +131,12 @@ int main( int argc, char **argv ) // install unexpected exception handler gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler); -#ifdef __aarch64__ - setenv("LD_PRELOAD", APP_PLUGIN_DIR"/libcef.so", 1); -#else # if LL_LINUX setenv("LD_PRELOAD", "libpthread.so.0 libGL.so.1", 1); # else setenv("LD_PRELOAD", "libpthread.so libGL.so.1", 1); # endif setenv("__GL_THREADED_OPTIMIZATIONS", "1", 0); -#endif bool ok = viewer_app_ptr->init(); if(!ok) |