diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 12:17:58 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 12:17:58 +0100 |
commit | e2b51b8884d1003a3312276611b8a8c34123bc36 (patch) | |
tree | 2a62d60e216e172685670230e544103444e28c4c /indra/cmake/Copy3rdPartyLibs.cmake | |
parent | e2e329b2e22dbab52d12ff309fb78533cb52c8e9 (diff) | |
parent | 7bb6532e93b7536a9a11cf19db10ba0cda1d99c3 (diff) |
merge from viewer-public
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
-rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index faf9da8b14..c9dc301b8b 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 @@ -38,6 +38,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables @@ -48,6 +50,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) if(USE_GOOGLE_PERFTOOLS) |