livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update libpng and jpeglib archives for mac.

master
Andrew A. de Laix 2011-03-07 11:44:51 -08:00
parent 7587b1b3bb
commit 33927b8451
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -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>

2
indra/cmake/JPEG.cmake
View File

@ -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)

3
indra/cmake/PNG.cmake
View File

@ -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)