diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2011-02-24 16:07:20 -0800 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2011-02-24 16:07:20 -0800 |
| commit | 7aca14a77a706f12c22540f7f3a36ec4ee8d8402 (patch) | |
| tree | 4d239ecd55630b428a7b45c0e06c95274107eca9 | |
| parent | 2c27d432288c4c678ddee0c839576e759d6b3195 (diff) | |
| parent | 713933fa763f2b489e4083ad8a85ac0dfa03903c (diff) | |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/PNG.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index d407f565d9..8dd2f91718 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1004,9 +1004,9 @@ <key>archive</key> <map> <key>hash</key> - <string>dd0e68bde099def37c6a7527673aa672</string> + <string>735a955e6442733e2342ab12c1087488</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20101001a.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221747/arch/CYGWIN/installer/libpng-1.5.1-windows-20110221.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index f6522d9e2f..33fc3e5bac 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,6 +8,6 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - set(PNG_LIBRARIES png12) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + set(PNG_LIBRARIES libpng15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) endif (STANDALONE) |