diff options
| -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> | 
