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 | |
| parent | 6a10c803d3b7d16c25d085f19fafd404b95eb485 (diff) | |
| parent | c5aaefe37f9d7e894076dae26245a3d87f74d0ff (diff) | |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/CARes.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/JPEG.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/PNG.cmake | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 1850b706ac..b0dac5b12f 100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake @@ -13,10 +13,7 @@ else (STANDALONE) if (WINDOWS) set(CARES_LIBRARIES areslib) elseif (DARWIN) - set(CARES_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a - ) + set(CARES_LIBRARIES cares) else (WINDOWS) set(CARES_LIBRARIES cares) endif (WINDOWS) 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) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 33fc3e5bac..86b7267494 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,6 +8,11 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - set(PNG_LIBRARIES libpng15) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + if (WINDOWS) + set(PNG_LIBRARIES libpng15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + else() + set(PNG_LIBRARIES png12) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + endif() endif (STANDALONE) |