diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-10-08 17:06:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-08 17:06:20 +0300 |
| commit | 6ccae2d0ae977965202ecb45de77e46f8d0312b3 (patch) | |
| tree | 0819595c2a50aa7066b0c75b49d3b6c31f5636b9 /indra/newview/viewer_manifest.py | |
| parent | ccc7fffb22b347149bf807b9d92677e5616c5017 (diff) | |
| parent | 3dca9fc377e855b74a78a5c30464b468dcc82644 (diff) | |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index daa7e58211..efc90b8991 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -72,6 +72,7 @@ class ViewerManifest(LLManifest): self.exclude("logcontrol.xml") self.exclude("logcontrol-dev.xml") self.path("*.ini") + self.path("*.txt") self.path("*.xml") # include the entire shaders directory recursively @@ -584,6 +585,9 @@ class Windows_x86_64_Manifest(ViewerManifest): self.path("vivoxsdk_x64.dll") self.path("ortp_x64.dll") + # SDL2 + self.path("SDL2.dll") + # BugSplat if self.args.get('bugsplat'): self.path("BsSndRpt64.exe") @@ -928,6 +932,7 @@ class Darwin_x86_64_Manifest(ViewerManifest): with self.prefix(src=relpkgdir, dst=""): self.path("libndofdev.dylib") + self.path("libSDL2-*.dylib") with self.prefix(src_dst="cursors_mac"): self.path("*.tif") @@ -1406,7 +1411,7 @@ class Linux_x86_64_Manifest(LinuxManifest): pkgdir = self.args['package_dir'] relpkgdir = os.path.join(pkgdir, "lib", "release") - debpkgdir = os.path.join(pkgdir, "lib", "debug") + #debpkgdir = os.path.join(pkgdir, "lib", "debug") with self.prefix(src=relpkgdir, dst="lib"): self.path("libapr-1.so*") |