diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-03-13 12:51:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 12:51:09 -0700 |
| commit | 665d59d46eced8b0864d83191e7391933bb308ac (patch) | |
| tree | 354f1dd1b993806c1a174e22847cb9d64f488daa /indra | |
| parent | d909e7243861320b43634ab9cafd2bb5a8dc558b (diff) | |
| parent | 4c3d090bf425ea81de4e308e1a8b46d78f646eb7 (diff) | |
Merge pull request #978 from secondlife/brad/926-hdri-local-openexr-static-link
secondlife/viewer#926 chage openexr lib to use static link on mac
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 6 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 415641f65f..873253b419 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -190,12 +190,6 @@ elseif(DARWIN) liburiparser.dylib liburiparser.1.dylib liburiparser.1.0.27.dylib - libIex-3_2.dylib - libIlmThread-3_2.dylib - libImath-3_1.dylib - libOpenEXR-3_2.dylib - libOpenEXRCore-3_2.dylib - libOpenEXRUtil-3_2.dylib ) if (TARGET ll::fmodstudio) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 70121ecc64..5258842b75 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -942,12 +942,6 @@ class Darwin_x86_64_Manifest(ViewerManifest): with self.prefix(src=relpkgdir, dst=""): self.path("libndofdev.dylib") self.path("libhunspell-*.dylib") - self.path("libIex-3_2.dylib") - self.path("libIlmThread-3_2.dylib") - self.path("libImath-3_1.dylib") - self.path("libOpenEXR-3_2.dylib") - self.path("libOpenEXRCore-3_2.dylib") - self.path("libOpenEXRUtil-3_2.dylib") with self.prefix(src_dst="cursors_mac"): self.path("*.tif") |