From 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 11:44:51 -0800
Subject: update libpng and jpeglib archives for mac.

---
 indra/cmake/JPEG.cmake | 2 +-
 indra/cmake/PNG.cmake  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

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)
-- 
cgit v1.2.3