diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
| commit | d5f96c38e6f5838672c87e540aaaa3b1663837f8 (patch) | |
| tree | 3aac617ceed3eb3ae2a1aa6cfaca9bb96d4ff4c7 /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 84202f19a52b8d04bf900a72acf4214b73acc820 (diff) | |
| parent | 4b7793a119f4e4c8c4f03b6ff9adb0eb6fe94209 (diff) | |
merge from viewer-pre-beta
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 4202b54f94..d9efc8f40d 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -39,6 +39,8 @@ if(WINDOWS) libapriconv-1.dll ssleay32.dll libeay32.dll + libcollada14dom22-d.dll + glod.dll ) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") @@ -49,6 +51,8 @@ if(WINDOWS) libapriconv-1.dll ssleay32.dll libeay32.dll + libcollada14dom22.dll + glod.dll ) if(USE_GOOGLE_PERFTOOLS) @@ -207,9 +211,12 @@ elseif(DARWIN) libaprutil-1.dylib libexpat.1.5.2.dylib libexpat.dylib - libllqtwebkit.dylib + libGLOD.dylib + libllqtwebkit.dylib + libminizip.a libndofdev.dylib libexception_handler.dylib + libcollada14dom.dylib ) # fmod is statically linked on darwin @@ -245,20 +252,23 @@ elseif(LINUX) libaprutil-1.so.0 libatk-1.0.so libbreakpad_client.so.0 + libcollada14dom.so libcrypto.so.1.0.0 libdb-5.1.so libexpat.so libexpat.so.1 + libglod.so libgmock_main.so libgmock.so.0 libgmodule-2.0.so libgobject-2.0.so libgtest_main.so libgtest.so.0 + libminizip.so libopenal.so libopenjpeg.so libssl.so - libtcmalloc.so + libtcmalloc_minimal.so libuuid.so.16 libuuid.so.16.0.22 libssl.so.1.0.0 |