diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-14 17:59:00 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-14 17:59:00 -0400 |
| commit | 04404b68b56638171bc200f9a22a660257370d5d (patch) | |
| tree | 2368e446bcdb6231715300be5b9a7de80024376f /indra/cmake | |
| parent | e72d546fe36ffb262a6a844ac4aae432df357ed5 (diff) | |
All/Mac: Update libraries to new template builds. Package for static libz/libpng/openssl.
Update library dependencies to reference builds using new templates and
modern build hosts for: SDL, c-ares, boost, curl, libpng, llqtwebkit2,
openssl and zlib. Update manifest, library copying and 'test_apps' setup
to reflect that zlib and openssl are now always static (on Mac and
Linux). Viewer and test_apps now functional on 10.7 Mac.
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 5dfa6ea4fb..068f1e9af7 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -206,10 +206,6 @@ elseif(DARWIN) ) set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files - libcrypto.dylib - libcrypto.1.0.0.dylib - libssl.dylib - libssl.1.0.0.dylib ) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files @@ -218,8 +214,6 @@ elseif(DARWIN) libaprutil-1.0.dylib libaprutil-1.dylib libcollada14dom.dylib - libcrypto.dylib - libcrypto.1.0.0.dylib libexception_handler.dylib libexpat.1.5.2.dylib libexpat.dylib @@ -227,8 +221,6 @@ elseif(DARWIN) libhunspell-1.3.0.dylib libminizip.a libndofdev.dylib - libssl.dylib - libssl.1.0.0.dylib ) if (FMODEX) @@ -275,7 +267,6 @@ elseif(LINUX) libboost_system-mt.so.${BOOST_VERSION}.0 libboost_thread-mt.so.${BOOST_VERSION}.0 libcollada14dom.so - libcrypto.so.1.0.0 libdb-5.1.so libexpat.so libexpat.so.1 @@ -291,10 +282,8 @@ elseif(LINUX) libminizip.so libopenal.so libopenjpeg.so - libssl.so libuuid.so.16 libuuid.so.16.0.22 - libssl.so.1.0.0 libfontconfig.so.1.8.0 ) |