diff options
author | Dave Parks <davep@lindenlab.com> | 2010-04-07 12:39:45 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-04-07 12:39:45 -0500 |
commit | b6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch) | |
tree | 99b5c533bcf19a4b02247e601939346b6f2151df /indra/cmake/Copy3rdPartyLibs.cmake | |
parent | 87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff) | |
parent | 3b7b578733867efaeb9359df69df1fe400de0f10 (diff) |
merge
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) |