From 9b1c8534fbb0e99e9e20142fdc9582f3966c1e01 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 3 Jun 2020 11:36:13 +0300
Subject: More post-merge cleanup

---
 indra/newview/CMakeLists.txt     | 5 -----
 indra/newview/viewer_manifest.py | 9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a2892f9c7e..8977dcf50d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1939,7 +1939,6 @@ if (WINDOWS)
           --artwork=${ARTWORK_DIR}
           "--bugsplat=${BUGSPLAT_DB}"
           "--fmodstudio=${FMODSTUDIO}"
-          "--fmodex=${FMODEX}"
           "--openal=${OPENAL}"
           --build=${CMAKE_CURRENT_BINARY_DIR}
           --buildtype=${CMAKE_BUILD_TYPE}
@@ -2087,7 +2086,6 @@ if (LINUX)
         --artwork=${ARTWORK_DIR}
         "--bugsplat=${BUGSPLAT_DB}"
         "--fmodstudio=${FMODSTUDIO}"
-        "--fmodex=${FMODEX}"
         "--openal=${OPENAL}"
         --build=${CMAKE_CURRENT_BINARY_DIR}
         --buildtype=${CMAKE_BUILD_TYPE}
@@ -2116,7 +2114,6 @@ if (LINUX)
       --artwork=${ARTWORK_DIR}
       "--bugsplat=${BUGSPLAT_DB}"
       "--fmodstudio=${FMODSTUDIO}"
-      "--fmodex=${FMODEX}"
       "--openal=${OPENAL}"
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --buildtype=${CMAKE_BUILD_TYPE}
@@ -2195,7 +2192,6 @@ if (DARWIN)
       --artwork=${ARTWORK_DIR}
       "--bugsplat=${BUGSPLAT_DB}"
       "--fmodstudio=${FMODSTUDIO}"
-      "--fmodex=${FMODEX}"
       "--openal=${OPENAL}"
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --buildtype=${CMAKE_BUILD_TYPE}
@@ -2232,7 +2228,6 @@ if (DARWIN)
           --artwork=${ARTWORK_DIR}
           "--bugsplat=${BUGSPLAT_DB}"
           "--fmodstudio=${FMODSTUDIO}"
-          "--fmodex=${FMODEX}"
           "--openal=${OPENAL}"
           --build=${CMAKE_CURRENT_BINARY_DIR}
           --buildtype=${CMAKE_BUILD_TYPE}
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e9007fd7b5..0a96444a7a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1064,7 +1064,7 @@ class DarwinManifest(ViewerManifest):
                                     "libfmod.dylib",
                                     ):
                             dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
- 
+
                 # our apps
                 executable_path = {}
                 for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"),
@@ -1535,10 +1535,6 @@ class Linux_i686_Manifest(LinuxManifest):
                 except:
                     print "Skipping libfmod.so - not found"
                     pass
-            if self.args['fmodex'] == 'ON':
-                self.path("libfmodex-*.so")
-                self.path("libfmodex.so")
-
 
         # Vivox runtimes
         with self.prefix(src=relpkgdir, dst="bin"):
@@ -1564,12 +1560,11 @@ class Linux_x86_64_Manifest(LinuxManifest):
 ################################################################
 
 if __name__ == "__main__":
-    # fmodex and openal can be used simultaneously and controled by environment
+    # fmodstudio and openal can be used simultaneously and controled by environment
     extra_arguments = [
         dict(name='bugsplat', description="""BugSplat database to which to post crashes,
              if BugSplat crash reporting is desired""", default=''),
         dict(name='fmodstudio', description="""Indication if fmod studio libraries are needed""", default='OFF'),
-        dict(name='fmodex', description="""Indication that fmodex libraries are needed""", default='OFF'),
         dict(name='openal', description="""Indication openal libraries are needed""", default='OFF'),
         ]
     try:
-- 
cgit v1.2.3