diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-06-07 12:14:13 +0100 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-07 12:14:13 +0100 |
commit | 185cd5d261a4bc6e02f49f40c72d76da4320a881 (patch) | |
tree | c08ae4afb5e79f6b90bfe085a32b4d3e6e16a070 /indra/cmake/Copy3rdPartyLibs.cmake | |
parent | eec00a712fff079009ae793d86e27b7f3ab13053 (diff) | |
parent | edd224dc7b08ad72c0f36c5b0f24912fdf66ab1c (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
-rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index faf9da8b14..89422fbdb2 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -19,7 +19,7 @@ if(WINDOWS) set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") set(vivox_files SLVoice.exe - libsndfile-1.dll + libsndfile-1.dll vivoxplatform.dll vivoxsdk.dll ortp.dll @@ -167,6 +167,7 @@ elseif(DARWIN) libexpat.dylib libllqtwebkit.dylib libndofdev.dylib + libexception_handler.dylib ) # fmod is statically linked on darwin @@ -216,6 +217,7 @@ elseif(LINUX) libapr-1.so.0 libaprutil-1.so.0 libatk-1.0.so + libbreakpad_client.so.0 libcrypto.so.0.9.7 libdb-4.2.so libexpat.so |