diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-03 00:20:38 +0300 | 
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-03 00:20:38 +0300 | 
| commit | 547361692e485bd8f8f2e6640fa13f55fb8d62ab (patch) | |
| tree | 49018941cda34cd2205ba24de045e255d26c07bf /indra/newview | |
| parent | 363e9c949bf1179575fafa65d504d04383efbc1e (diff) | |
Post-merge buildfix
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 9 | 
1 files changed, 0 insertions, 9 deletions
| diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5080b93345..e9007fd7b5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1057,11 +1057,6 @@ class DarwinManifest(ViewerManifest):                      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 @@ class DarwinManifest(ViewerManifest):                                      "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 = {} | 
