diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-21 15:27:51 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-21 15:27:51 +0800 |
| commit | 6da23f151be1ce7ad98912b504ef4dbcb0cdd494 (patch) | |
| tree | ae2534631d44e51a150991b4531cdddcbd1bc0cc | |
| parent | eccb10575d3b6dc841cf4bf07db29833174d1c69 (diff) | |
Revert "FreeBSD can use llappviewerlinux too"
This reverts commit 8356386f6674cf7f1e25bcd49f3266868cd5dc7d.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 48c9462f9f..a4e40d0959 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1413,7 +1413,7 @@ if (DARWIN) list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES}) endif (DARWIN) -if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +if (LINUX) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) set_source_files_properties( llappviewerlinux.cpp @@ -1423,7 +1423,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") -endif (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +endif (LINUX) if (WINDOWS) list(APPEND viewer_SOURCE_FILES 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 |