diff options
| author | Don Kjer <don@lindenlab.com> | 2012-12-12 00:34:40 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-12-12 00:34:40 +0000 |
| commit | 531394df23d774ad91ea5986ede8d44ccf9234a1 (patch) | |
| tree | 06f7983b00772b1466e8dc1510f15c45013355d4 | |
| parent | a5205d4d6a5f3478927cbede80671051c3e16f35 (diff) | |
Updating linux libGLOD to match darwin naming
| -rw-r--r-- | autobuild.xml | 6 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/GLOD.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 7fd8826c18..eb2371a642 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -30,9 +30,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c0c64dae149d0892343e2ff300fd06b9</string> + <string>176736c52b3cde6ca8e7d9e173d91731</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/232684/arch/Linux/installer/glod-1.0pre4-linux-20110611.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/268002/arch/Linux/installer/glod-1.0pre4-linux-20121212.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1453,7 +1453,7 @@ </map> </map> </map> - <key>mesa</key> + <key>mesa</key> <map> <key>license</key> <string>mesa</string> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c32e357da3..338da4743e 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -266,7 +266,7 @@ elseif(LINUX) libdb-5.1.so libexpat.so libexpat.so.1 - libglod.so + libGLOD.so libgmock_main.so libgmock.so.0 libgmodule-2.0.so diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake index 77221d55ed..6bdbaf621e 100644 --- a/indra/cmake/GLOD.cmake +++ b/indra/cmake/GLOD.cmake @@ -6,4 +6,4 @@ if (NOT STANDALONE) endif (NOT STANDALONE) set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) -set(GLOD_LIBRARIES glod) +set(GLOD_LIBRARIES GLOD) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ea75d4f4f6..7a41520429 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1079,7 +1079,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libcrypto.so.*") self.path("libexpat.so.*") self.path("libssl.so.1.0.0") - self.path("libglod.so") + self.path("libGLOD.so") self.path("libminizip.so") self.path("libuuid.so*") self.path("libSDL-1.2.so.*") |