diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-07 11:44:51 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-07 11:44:51 -0800 |
| commit | 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 (patch) | |
| tree | 32db9e894ea47693a6475028236d904b01effe44 | |
| parent | 7587b1b3bbcd2c395729d6a203c45e754dd746bf (diff) | |
update libpng and jpeglib archives for mac.
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/cmake/JPEG.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/PNG.cmake | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index f808339a49..37388a8fa4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -836,9 +836,9 @@ <key>archive</key> <map> <key>hash</key> - <string>d94de5a98492018144b95a8022ed4e44</string> + <string>71bd6efbf508e1f2e7d98a6195a93e9e</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20101004.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/222232/arch/Darwin/installer/jpeglib-8c-darwin-20110228.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -980,9 +980,9 @@ <key>archive</key> <map> <key>hash</key> - <string>4aa623811aff42df702e8d3fdd848ac3</string> + <string>6fe1adf12d98bce9111f60ee762007b9</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20101004.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Darwin/installer/libpng-1.5.1-darwin-20110222.tar.bz2</string> </map> <key>name</key> <string>darwin</string> diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 0f0bbb9564..4f99efd602 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -12,7 +12,7 @@ else (STANDALONE) if (LINUX) set(JPEG_LIBRARIES jpeg) elseif (DARWIN) - set(JPEG_LIBRARIES lljpeg) + set(JPEG_LIBRARIES jpeg) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 86b7267494..60f749869a 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -11,6 +11,9 @@ else (STANDALONE) if (WINDOWS) set(PNG_LIBRARIES libpng15) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + elseif(DARWIN) + set(PNG_LIBRARIES png15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) else() set(PNG_LIBRARIES png12) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) |