summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2010-09-23 11:25:40 -0400
committerNyx Linden <nyx@lindenlab.com>2010-09-23 11:25:40 -0400
commit245842a765c8416fc0e0d5c38d0cb731ed7d5cbf (patch)
tree7a7e810e7c79edb90e55fb64d243ee85a3f43db4 /indra/newview
parentc20400a4c9679bca7a467358afd7b21c8f257c67 (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.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py2
1 files changed, 2 insertions, 0 deletions
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" %