diff options
| author | Jacek Antonelli | 2009-11-19 04:19:06 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-19 04:19:06 -0600 |
| commit | 1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427 (patch) | |
| tree | e09ccbc010e326a48fd91ba15b58afd7fb836b3f /linden/indra/cmake/JPEG.cmake | |
| parent | Fixed minor formatting issue in MANIFESTO.txt. (diff) | |
| parent | Fixed CMake setting errors (diff) | |
| download | meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.zip meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.gz meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.bz2 meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.xz | |
Merge remote branch 'mccabe/1.3.0-next' into next
Conflicts:
linden/indra/cmake/00-Common.cmake
linden/indra/newview/skins/default/xui/de/floater_about.xml
linden/indra/newview/skins/default/xui/fr/floater_about.xml
linden/indra/newview/skins/default/xui/ja/floater_about.xml
linden/indra/newview/skins/default/xui/ko/floater_about.xml
linden/indra/newview/skins/default/xui/zh/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/cmake/JPEG.cmake')
| -rw-r--r-- | linden/indra/cmake/JPEG.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake index 92aa458..4f99efd 100644 --- a/linden/indra/cmake/JPEG.cmake +++ b/linden/indra/cmake/JPEG.cmake | |||
| @@ -14,7 +14,7 @@ else (STANDALONE) | |||
| 14 | elseif (DARWIN) | 14 | elseif (DARWIN) |
| 15 | set(JPEG_LIBRARIES jpeg) | 15 | set(JPEG_LIBRARIES jpeg) |
| 16 | elseif (WINDOWS) | 16 | elseif (WINDOWS) |
| 17 | set(JPEG_LIBRARIES jpeglib_6b) | 17 | set(JPEG_LIBRARIES jpeglib) |
| 18 | endif (LINUX) | 18 | endif (LINUX) |
| 19 | set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) | 19 | set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) |
| 20 | endif (STANDALONE) | 20 | endif (STANDALONE) |