diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-03-03 10:38:39 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 10:38:39 -0800 |
| commit | 8dffedb246dd5fdf89aadded14630a5e8691b30c (patch) | |
| tree | 34170953d7202fe61bf7c4319e0215d233722ad2 /indra/cmake/PNG.cmake | |
| parent | aa72b0df03c1dfea7571eae4abed30ce9f269158 (diff) | |
| parent | fa20a6de086febf0b6b098172685c26f939876f6 (diff) | |
merge from lindenlab/viewer-development
Diffstat (limited to 'indra/cmake/PNG.cmake')
| -rw-r--r-- | indra/cmake/PNG.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index f6522d9e2f..86b7267494 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,6 +8,11 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - set(PNG_LIBRARIES png12) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + if (WINDOWS) + set(PNG_LIBRARIES libpng15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + else() + set(PNG_LIBRARIES png12) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + endif() endif (STANDALONE) |