diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-07 11:44:51 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-07 11:44:51 -0800 |
| commit | 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 (patch) | |
| tree | 32db9e894ea47693a6475028236d904b01effe44 /indra | |
| parent | 7587b1b3bbcd2c395729d6a203c45e754dd746bf (diff) | |
update libpng and jpeglib archives for mac.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/JPEG.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/PNG.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 0f0bbb9564..4f99efd602 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -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) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 86b7267494..60f749869a 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -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) |