summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-22 05:50:46 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-22 05:50:46 +0800
commitf900a9ae67c61b3e53c36c119440cbc3710a2f7c (patch)
tree341a78d70c88e414f501a4023318ceabb338d6ec /indra/llwindow
parentc06c7e0b0eb4b7a7aaa70a3559b08b18c73aea17 (diff)
parent060bebcd3cbb5fbf6045bd777364947a2d8963d3 (diff)
Merge branch 'main' into 2025.04
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/CMakeLists.txt5
-rw-r--r--indra/llwindow/llwindowsdl.cpp6
2 files changed, 2 insertions, 9 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 6b347b357c..1f0820a9f6 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -55,7 +55,6 @@ set(llwindow_LINK_LIBRARIES
llfilesystem
llxml
ll::glm
- ll::glext
ll::uilibraries
ll::SDL
)
@@ -64,7 +63,7 @@ include_directories(${CMAKE_SOURCE_DIR}/llrender)
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
-if (USESYSTEMLIBS AND NOT DARWIN)
+if (NOT DARWIN)
list(APPEND viewer_SOURCE_FILES
llkeyboardsdl.cpp
llwindowsdl.cpp
@@ -86,7 +85,7 @@ if (USESYSTEMLIBS AND NOT DARWIN)
fontconfig # For FCInit and other FC* functions.
)
endif (BUILD_HEADLESS)
-endif (USESYSTEMLIBS AND NOT DARWIN)
+endif ()
if (DARWIN)
list(APPEND llwindow_SOURCE_FILES
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 8c90f917b8..f667ff7542 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -2689,13 +2689,7 @@ void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url, bool async)
# endif // LL_X11
std::string cmd, arg;
-#ifdef LL_USESYSTEMLIBS
cmd = gDirUtilp->getExecutableDir();
-#else
- cmd = gDirUtilp->getAppRODataDir();
- cmd += gDirUtilp->getDirDelimiter();
- cmd += "etc";
-#endif
cmd += gDirUtilp->getDirDelimiter();
cmd += "launch_url.sh";
arg = escaped_url;