From b74f698caaaa6ac8d498ea0461c354bb9cbb2b95 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 6 Sep 2019 11:51:36 -0400 Subject: handle slvoice executable separately from the vivox libraries, and update mac slvoice package --- indra/newview/viewer_manifest.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8a38f3a742..c5cf237f63 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -534,8 +534,11 @@ class WindowsManifest(ViewerManifest): self.path("msvcr120.dll") self.path("msvcp120.dll") - # Vivox runtimes - self.path("SLVoice.exe") + # SLVoice executable + with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): + self.path("SLVoice.exe") + + # Vivox libraries if (self.address_size == 64): self.path("vivoxsdk_x64.dll") self.path("ortp_x64.dll") @@ -1032,11 +1035,14 @@ class DarwinManifest(ViewerManifest): ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) - # SLVoice and vivox lols, no symlinks needed + # SLVoice executable + with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): + self.path("SLVoice.exe") + + # Vivox libraries for libfile in ( 'libortp.dylib', 'libvivoxsdk.dylib', - 'SLVoice', ): self.path2basename(relpkgdir, libfile) -- cgit v1.2.3