summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-29 17:12:57 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-29 17:12:57 -0800
commit04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch)
treeb0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/cmake
parentaaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff)
parent7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff)
merge.
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake6
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)