diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
| commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
| tree | c641bd45e6384c85bff5e43ab01af5cad784283b /indra/cmake/JPEG.cmake | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
| parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) | |
merge out latest 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) |