diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
commit | 9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch) | |
tree | 529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /indra/cmake/JPEG.cmake | |
parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
parent | 819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff) |
pull updates to the start of 2.6.2 from viewer-development
Diffstat (limited to 'indra/cmake/JPEG.cmake')
-rw-r--r-- | indra/cmake/JPEG.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 9514d59f64..4f99efd602 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -12,10 +12,7 @@ else (STANDALONE) if (LINUX) set(JPEG_LIBRARIES jpeg) elseif (DARWIN) - set(JPEG_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a - ) + set(JPEG_LIBRARIES jpeg) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) |