From d45dcd8daa6a02405ea9fc1f4824ec92fe73f7b2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 19 Nov 2008 17:02:10 -0600 Subject: Package up OpenAL libs. --- ChangeLog.txt | 4 ++++ linden/indra/newview/viewer_manifest.py | 25 +++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 48fb63c..a108c5e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ 2008-11-19 Jacek Antonelli + * linden/indra/newview/viewer_manifest.py: + Package up OpenAL libs. + + * indra/llaudio/audioengine_openal.cpp: VWR-2662: OpenAL support (patch by Tofu Linden) * indra/llaudio/audioengine_openal.h: Ditto. diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index be28809..bdf537a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -208,18 +208,20 @@ class WindowsManifest(ViewerManifest): self.end_prefix() # Vivox runtimes - #if self.prefix(src="vivox-runtime/i686-win32", dst=""): + if self.prefix(src="vivox-runtime/i686-win32", dst=""): + self.path("alut.dll") + self.path("wrap_oal.dll") + # self.path("SLVoice.exe") # self.path("SLVoiceAgent.exe") # self.path("libeay32.dll") # self.path("srtp.dll") # self.path("ssleay32.dll") # self.path("tntk.dll") - # self.path("alut.dll") # self.path("vivoxsdk.dll") # self.path("ortp.dll") - # self.path("wrap_oal.dll") - # self.end_prefix() + + self.end_prefix() # # pull in the crash logger and updater from other projects # self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter @@ -398,9 +400,10 @@ class DarwinManifest(ViewerManifest): self.path("Japanese.lproj") self.path("Korean.lproj") + # SLVoice and vivox lols - #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") - #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") + self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") + self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") #self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib") #self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") @@ -625,18 +628,20 @@ class Linux_i686Manifest(LinuxManifest): #self.path("libtcmalloc.so.0") - bugged #self.path("libstacktrace.so.0") - probably bugged # self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason + self.end_prefix("lib") # Vivox runtimes #if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): # self.path("SLVoice") # self.end_prefix() - #if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): - # self.path("libopenal.so.1") + + if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): + self.path("libopenal.so.1") + self.path("libalut.so") # self.path("libortp.so") # self.path("libvivoxsdk.so") - # self.path("libalut.so") - # self.end_prefix("lib") + self.end_prefix("lib") class Linux_x86_64Manifest(LinuxManifest): def construct(self): -- cgit v1.1