diff options
| author | Oz Linden <oz@lindenlab.com> | 2019-09-18 12:51:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2019-09-18 12:51:03 -0400 |
| commit | 5aff3dfaf950c16ca6ea5708026f917602021dcb (patch) | |
| tree | 2a7a8a1203667835a1c82c308f17980e3dc33fd8 | |
| parent | 637b13cf74341c25d1c0cdc565efdbee2694dac9 (diff) | |
more Mac manifest cleanup
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9976c49ca5..caf7815497 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1018,33 +1018,19 @@ class DarwinManifest(ViewerManifest): # symlink from sub-app/Contents/Resources to the real .dylib. # Need to get the llcommon dll from any of the build directories as well. libfile_parent = self.get_dst_prefix() - libfile = "libllcommon.dylib" - dylibs = path_optional(self.find_existing_file(os.path.join(os.pardir, - "llcommon", - self.args['configuration'], - libfile), - os.path.join(relpkgdir, libfile)), - dst=libfile) - for libfile in ( "libapr-1.0.dylib", "libaprutil-1.0.dylib", - "libcollada14dom.dylib", "libexpat.1.dylib", "libexception_handler.dylib", "libGLOD.dylib", - # libnghttp2.dylib is a symlink to - # libnghttp2.major.dylib, which is a symlink to - # libnghttp2.version.dylib. Get all of them. "libnghttp2.*dylib", ): - dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) + dylibs = path_optional(os.path.join(relpkgdir, libfile), libfile) # SLVoice and vivox lols, no symlinks needed for libfile in ( 'libortp.dylib', - #'libsndfile.dylib', - #'libvivoxoal.dylib', 'libvivoxsdk.dylib', 'libvivoxplatform.dylib', 'SLVoice', |