diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
| commit | 51b75b883269a0a78a9428a690324c17abf028c1 (patch) | |
| tree | 56e131516119cf7c6fef2219ca8b8b454ceab0c0 /indra/cmake/JPEG.cmake | |
| parent | c4ec708922ad5d4a5844b90b8042a939a34733ac (diff) | |
| parent | df329d14a9b882f1bc9c2c598043569ca2688c03 (diff) | |
merge changes for storm-1108
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) |