From 245842a765c8416fc0e0d5c38d0cb731ed7d5cbf Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Thu, 23 Sep 2010 11:25:40 -0400
Subject: 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.
---
indra/cmake/Copy3rdPartyLibs.cmake | 3 ++-
indra/newview/viewer_manifest.py | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'indra')
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" %
--
cgit v1.2.3