diff options
| -rw-r--r-- | .github/workflows/build.yaml | 6 | ||||
| -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 |
4 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6fe5a75f48..1421b2bd30 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,9 +48,9 @@ jobs: matrix: runner: [windows-large, macos-12-xl] configuration: ${{ fromJSON(needs.setup.outputs.configurations) }} - # include: - # - runner: linux-large - # configuration: ReleaseOS + include: + - runner: linux-large + configuration: ReleaseOS runs-on: ${{ matrix.runner }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} 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") |