diff options
| author | Jacek Antonelli | 2009-11-08 14:25:25 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-08 14:25:25 -0600 |
| commit | 125fe3ac425d38c04f97bd84b86812521f973982 (patch) | |
| tree | 520651daa1b7faf2e5bb9c98ef079827b8630b88 /linden/indra/cmake/JPEG.cmake | |
| parent | Attempted to make the Advanced shortcut play nice with Linux in XUI (diff) | |
| download | meta-impy-125fe3ac425d38c04f97bd84b86812521f973982.zip meta-impy-125fe3ac425d38c04f97bd84b86812521f973982.tar.gz meta-impy-125fe3ac425d38c04f97bd84b86812521f973982.tar.bz2 meta-impy-125fe3ac425d38c04f97bd84b86812521f973982.tar.xz | |
Finally packaged up Mac libraries.
flac, glib, gstreamer, gstreamer-plugins, jpeg-6b, liboil,
libpng, libxml, neon, ogg-vorbis, openal, thoera.
Diffstat (limited to 'linden/indra/cmake/JPEG.cmake')
| -rw-r--r-- | linden/indra/cmake/JPEG.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake index 5d0ee0d..92aa458 100644 --- a/linden/indra/cmake/JPEG.cmake +++ b/linden/indra/cmake/JPEG.cmake | |||
| @@ -12,10 +12,7 @@ else (STANDALONE) | |||
| 12 | if (LINUX) | 12 | if (LINUX) |
| 13 | set(JPEG_LIBRARIES jpeg) | 13 | set(JPEG_LIBRARIES jpeg) |
| 14 | elseif (DARWIN) | 14 | elseif (DARWIN) |
| 15 | set(JPEG_LIBRARIES | 15 | set(JPEG_LIBRARIES jpeg) |
| 16 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a | ||
| 17 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a | ||
| 18 | ) | ||
| 19 | elseif (WINDOWS) | 16 | elseif (WINDOWS) |
| 20 | set(JPEG_LIBRARIES jpeglib_6b) | 17 | set(JPEG_LIBRARIES jpeglib_6b) |
| 21 | endif (LINUX) | 18 | endif (LINUX) |