From cb2595bbb1dfce0170715b7b18c80218e0c20ce9 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 12 Jul 2023 16:28:19 +0800 Subject: Disable g_thread_init when using system libs On GCC, compiling against a recent GTK2 version would stop on deprecated pre-processors. --- indra/newview/llappviewerlinux.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llappviewerlinux.cpp') diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 9f58f90326..a110828967 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -120,7 +120,9 @@ bool LLAppViewerLinux::init() // before any mutexes are held, *and* some of our third-party // libraries likes to use glib functions; in short, do this here // really early in app startup! +#ifndef LL_USESYSTEMLIBS if (!g_thread_supported ()) g_thread_init (NULL); +#endif bool success = LLAppViewer::init(); -- cgit v1.2.3 From 8356386f6674cf7f1e25bcd49f3266868cd5dc7d Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 12 Jul 2023 21:28:49 +0800 Subject: FreeBSD can use llappviewerlinux too --- indra/newview/llappviewerlinux.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappviewerlinux.cpp') diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index a110828967..ad246ae64d 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -330,7 +330,7 @@ void LLAppViewerLinux::initCrashReporting(bool reportFreeze) { std::string cmd =gDirUtilp->getExecutableDir(); cmd += gDirUtilp->getDirDelimiter(); -#if LL_LINUX +#if LL_LINUX || LL_FREEBSD cmd += "linux-crash-logger.bin"; #else # error Unknown platform -- cgit v1.2.3 From 6da23f151be1ce7ad98912b504ef4dbcb0cdd494 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 21 Aug 2023 15:27:51 +0800 Subject: Revert "FreeBSD can use llappviewerlinux too" This reverts commit 8356386f6674cf7f1e25bcd49f3266868cd5dc7d. --- indra/newview/llappviewerlinux.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappviewerlinux.cpp') diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index ad246ae64d..a110828967 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -330,7 +330,7 @@ void LLAppViewerLinux::initCrashReporting(bool reportFreeze) { std::string cmd =gDirUtilp->getExecutableDir(); cmd += gDirUtilp->getDirDelimiter(); -#if LL_LINUX || LL_FREEBSD +#if LL_LINUX cmd += "linux-crash-logger.bin"; #else # error Unknown platform -- cgit v1.2.3 From f429c35bb46d4632e56cfff8e0fc7150baca3d27 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 21 Aug 2023 15:51:50 +0800 Subject: Any platform can, & should, use appviewerlinux too It's the one that plays along with SDL. --- indra/newview/llappviewerlinux.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llappviewerlinux.cpp') diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index a110828967..deb876e24d 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -330,11 +330,13 @@ void LLAppViewerLinux::initCrashReporting(bool reportFreeze) { std::string cmd =gDirUtilp->getExecutableDir(); cmd += gDirUtilp->getDirDelimiter(); -#if LL_LINUX +//#if LL_LINUX cmd += "linux-crash-logger.bin"; +/* #else # error Unknown platform #endif +*/ std::stringstream pid_str; pid_str << LLApp::getPid(); -- cgit v1.2.3