diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2010-09-23 11:25:40 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2010-09-23 11:25:40 -0400 |
| commit | 245842a765c8416fc0e0d5c38d0cb731ed7d5cbf (patch) | |
| tree | 7a7e810e7c79edb90e55fb64d243ee85a3f43db4 | |
| parent | c20400a4c9679bca7a467358afd7b21c8f257c67 (diff) | |
SH-64 update GLOD on mac
updated GLOD again to be searched for in the correct place and
updated some cmake configuration to ensure that it is being referred to
in the correct places.
This appears to finally solve our mac startup crash.
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 3 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 | ||||
| -rwxr-xr-x | install.xml | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..76cb0553f3 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -169,7 +169,8 @@ elseif(DARWIN) libaprutil-1.dylib libexpat.0.5.0.dylib libexpat.dylib - libllqtwebkit.dylib + libGLOD.dylib + libllqtwebkit.dylib libndofdev.dylib libexception_handler.dylib ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8296c28e80..d6b865c249 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -653,6 +653,7 @@ class DarwinManifest(ViewerManifest): "libaprutil-1.0.3.8.dylib", "libexpat.0.5.0.dylib", "libexception_handler.dylib", + "libGLOD.dylib", ): self.path(os.path.join(libdir, libfile), libfile) @@ -676,6 +677,7 @@ class DarwinManifest(ViewerManifest): "libaprutil-1.0.3.8.dylib", "libexpat.0.5.0.dylib", "libexception_handler.dylib", + "libGLOD.dylib", ): target_lib = os.path.join('../../..', libfile) self.run_command("ln -sf %(target)r %(link)r" % diff --git a/install.xml b/install.xml index f2f4a1b92c..083f3b0467 100755 --- a/install.xml +++ b/install.xml @@ -56,9 +56,9 @@ <key>darwin</key> <map> <key>md5sum</key> - <string>cc3a93782ac74982eb74aa5dbcd923f0</string> + <string>590cfe561e5696d2f3e0b6b394c5af47</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20100922.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20100923.tar.bz2</uri> </map> <key>linux</key> <map> |