From ba3e89b5c731ed6dc36d4650928be8081b3289f5 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 18 Jan 2013 16:43:19 -0800
Subject: first push - patch from CmdCupCake plus force FMODEX on

---
 indra/newview/viewer_manifest.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'indra/newview/viewer_manifest.py')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ea75d4f4f6..cdd227e9fe 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -367,6 +367,14 @@ class WindowsManifest(ViewerManifest):
                 print err.message
                 print "Skipping COLLADA and GLOD libraries (assumming linked statically)"
 
+            # Get fmodex dll, continue if missing
+            try:
+                if self.args['configuration'].lower() == 'debug':
+                    self.path("fmodexL.dll")
+                else:
+                    self.path("fmodex.dll")
+            except:
+                print "Skipping fmodex audio library(assuming other audio engine)"
 
             # Get fmod dll, continue if missing
             if not self.path("fmod.dll"):
@@ -743,6 +751,7 @@ class DarwinManifest(ViewerManifest):
                                 "libcollada14dom.dylib",
                                 "libexpat.1.5.2.dylib",
                                 "libexception_handler.dylib",
+                                "libfmodex.dylib",
                                 "libGLOD.dylib",
                                 ):
                     dylibs += path_optional(os.path.join(libdir, libfile), libfile)
@@ -1125,6 +1134,15 @@ class Linux_i686Manifest(LinuxManifest):
             except:
                     print "Skipping libfmod-3.75.so - not found"
                     pass
+
+            try:
+                    self.path("libfmodex-*.so")
+                    self.path("libfmodex.so")
+                    pass
+            except:
+                    print "Skipping libfmodex.so - not found"
+                    pass
+
             self.end_prefix("lib")
 
             # Vivox runtimes
-- 
cgit v1.2.3


From b0f2f02333a87598299b490a1e42eb42a8125f74 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 1 Feb 2013 08:44:52 -0800
Subject: Removed (most) references to older FMOD library - still a little
 Linux clean up left

---
 indra/newview/viewer_manifest.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview/viewer_manifest.py')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index cdd227e9fe..37b119041f 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -376,10 +376,6 @@ class WindowsManifest(ViewerManifest):
             except:
                 print "Skipping fmodex audio library(assuming other audio engine)"
 
-            # Get fmod dll, continue if missing
-            if not self.path("fmod.dll"):
-                print "Skipping fmod.dll"
-
             # For textures
             if self.args['configuration'].lower() == 'debug':
                 self.path("openjpegd.dll")
-- 
cgit v1.2.3


From bc161b040a5f6817a9adcec759e48bf590c2ed45 Mon Sep 17 00:00:00 2001
From: Sovereign Engineer <sovereign.engineer@outlook.com>
Date: Mon, 4 Feb 2013 08:21:19 -0500
Subject: Remove FMOD 3.75 leftovers

---
 indra/newview/viewer_manifest.py | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/viewer_manifest.py')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 37b119041f..557c213787 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1124,13 +1124,6 @@ class Linux_i686Manifest(LinuxManifest):
                 print "tcmalloc files not found, skipping"
                 pass
 
-            try:
-                    self.path("libfmod-3.75.so")
-                    pass
-            except:
-                    print "Skipping libfmod-3.75.so - not found"
-                    pass
-
             try:
                     self.path("libfmodex-*.so")
                     self.path("libfmodex.so")
-- 
cgit v1.2.3


From 8cf1d6af0d576ad460e441a45a455fbb45bcb9a7 Mon Sep 17 00:00:00 2001
From: Sovereign Engineer <sovereign.engineer@outlook.com>
Date: Mon, 4 Feb 2013 08:24:35 -0500
Subject: fmodwrapper uneeded with fmodex

---
 indra/newview/viewer_manifest.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/viewer_manifest.py')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 557c213787..6333c65047 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -762,11 +762,7 @@ class DarwinManifest(ViewerManifest):
                                 'SLVoice',
                                 ):
                      self.path2basename(libdir, libfile)
-                
-                # FMOD for sound
-                libfile = "libfmodwrapper.dylib"
-                path_optional(os.path.join(self.args['configuration'], libfile), libfile)
-                
+
                 # our apps
                 for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"),
                                          ("mac_updater", "mac-updater.app"),
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/viewer_manifest.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/viewer_manifest.py

(limited to 'indra/newview/viewer_manifest.py')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
old mode 100644
new mode 100755
-- 
cgit v1.2.3