diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-01 15:23:23 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-01 15:23:23 -0800 |
| commit | 31d673cb512f88c0bd55dd2f81671a16df0dc0c8 (patch) | |
| tree | 3d40ff68b7342865b5d7d150ba01fd69f4ccc7a3 /indra/cmake/JPEG.cmake | |
| parent | 6a10c803d3b7d16c25d085f19fafd404b95eb485 (diff) | |
| parent | c5aaefe37f9d7e894076dae26245a3d87f74d0ff (diff) | |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
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..0f0bbb9564 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 lljpeg) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) |