diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2011-02-24 15:59:52 -0800 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2011-02-24 15:59:52 -0800 |
| commit | 713933fa763f2b489e4083ad8a85ac0dfa03903c (patch) | |
| tree | aad7d0da0b5993279ab5f32c628ff1b8d02f2106 /indra | |
| parent | 62feb3b4bcb172f0668aaba9cb27b3387a7c4336 (diff) | |
| parent | 531de7491b0e73031538dbb9f5dc0dbea8e5f8e2 (diff) | |
Merged changes from bitbucket.org/squire_linden/viewer-vs2010
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/PNG.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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) |