SL-12654 Remove support for building with fmod ex

1 files changed, 0 insertions, 31 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0140a4b928..572c84c396 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -513,14 +513,6 @@ class WindowsManifest(ViewerManifest):
                 print err.message
                 print "Skipping GLOD library (assumming linked statically)"
 
-            # Get fmodex dll if needed
-            # Normally only fmodex or fmodstudio are needed, but just in case checkking both.
-            if self.args['fmodex'] == 'ON':
-                if(self.address_size == 64):
-                    self.path("fmodex64.dll")
-                else:
-                    self.path("fmodex.dll")
-
             # Get fmodstudio dll if needed
             if self.args['fmodstudio'] == 'ON':
                 if(self.args['configuration'].lower() == 'debug'):
@@ -1052,19 +1044,6 @@ class DarwinManifest(ViewerManifest):
                                 ):
                     self.path2basename(relpkgdir, libfile)
 
-                # Fmodex dylibs that vary based on configuration
-                if self.args['fmodex'] == 'ON':
-                    if self.args['configuration'].lower() == 'debug':
-                       for libfile in (
-                                    "libfmodexL.dylib",
-                                    ):
-                            dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile)
-                    else:
-                        for libfile in (
-                                    "libfmodex.dylib",
-                                    ):
-                            dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
-
                 # Fmod studio dylibs (vary based on configuration)
                 if self.args['fmodstudio'] == 'ON':
                     if self.args['configuration'].lower() == 'debug':
@@ -1539,15 +1518,6 @@ class Linux_i686_Manifest(LinuxManifest):
                 print "tcmalloc files not found, skipping"
                 pass
 
-            if self.args['fmodex'] == 'ON':
-                try:
-                    self.path("libfmodex-*.so")
-                    self.path("libfmodex.so")
-                    pass
-                except:
-                    print "Skipping libfmodex.so - not found"
-                    pass
-
             if self.args['fmodstudio'] == 'ON':
                 try:
                     self.path("libfmod.so.11.7")
@@ -1586,7 +1556,6 @@ if __name__ == "__main__":
     extra_arguments = [
         dict(name='bugsplat', description="""BugSplat database to which to post crashes,
              if BugSplat crash reporting is desired""", default=''),
-        dict(name='fmodex', description="""Indication if fmodex libraries are needed""", default='OFF'),
         dict(name='fmodstudio', description="""Indication if fmod studio libraries are needed""", default='OFF'),
         ]
     try: