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 /indra | |
| parent | 2c27d432288c4c678ddee0c839576e759d6b3195 (diff) | |
| parent | 713933fa763f2b489e4083ad8a85ac0dfa03903c (diff) | |
Automated merge with https://bitbucket.org/jenn_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) |