diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:39:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 19:39:46 +0300 |
| commit | 8f07f8e233ed5ed6c5a7b6f797d0ee7b18b652e2 (patch) | |
| tree | e28e27264c533ebba3b9ad651cfdf5765b6fd639 /indra | |
| parent | b4ed0089d7d1e01403a45af8e12889debf29b0f0 (diff) | |
| parent | 1f1ac55f5a69ab15844dab3cc33d6a60f9f47444 (diff) | |
Merge pull request #2377 from Nicky-D/marchcat/b-develop
Reenable Linux build
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llapr.h | 1 | ||||
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 00ff4d60b7..faf2d6fc92 100644 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -33,6 +33,7 @@ #include <sys/param.h> // Need PATH_MAX in APR headers... #endif +#include <memory> #include <boost/noncopyable.hpp> #include "llwin32headerslean.h" #include "apr_thread_proc.h" diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 9ebd6ef0b0..55f97b33c5 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -58,6 +58,7 @@ set(llwindow_LINK_LIBRARIES ll::glext ll::uilibraries ll::SDL + ll::zlib-ng ) # Libraries on which this library depends, needed for Linux builds diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 15cec11330..0428c6e3d5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1409,7 +1409,6 @@ class Linux_x86_64_Manifest(LinuxManifest): with self.prefix(src=relpkgdir, dst="lib"): self.path("libapr-1.so*") self.path("libaprutil-1.so*") - self.path("libexpat.so.*") self.path_optional("libSDL*.so.*") self.path_optional("libjemalloc*.so") |