From 547361692e485bd8f8f2e6640fa13f55fb8d62ab Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 3 Jun 2020 00:20:38 +0300
Subject: [PATCH] Post-merge buildfix
---
indra/newview/viewer_manifest.py | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 5080b93345d..e9007fd7b55 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1057,11 +1057,6 @@ def path_optional(src, dst):
if self.args['configuration'].lower() == 'debug':
for libfile in (
"libfmodL.dylib",
- # 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:
@@ -1069,10 +1064,6 @@ def path_optional(src, dst):
"libfmod.dylib",
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
-
- "libfmodex.dylib",
- ):
- dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
# our apps
executable_path = {}
--
GitLab