summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-10-14 11:26:59 -0500
committerDave Parks <davep@lindenlab.com>2010-10-14 11:26:59 -0500
commitc0d882fbff8b0bae584b25f57ebe614aeada6034 (patch)
tree20418c6d1a614d5075d8a63fd80a709b5fb90069 /indra
parent1259e05edcef4d1e23b38c9ca06b4ecd3f858781 (diff)
Updated colladadom.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake2
-rw-r--r--indra/cmake/LLPrimitive.cmake7
-rw-r--r--indra/newview/CMakeLists.txt3
3 files changed, 10 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7d227d3674..14c54d72ef 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -38,7 +38,7 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
- libcollada14dom21.dll
+ libcollada14dom21-d.dll
glod.dll
)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 9f8d99a0bf..fae1ef2a51 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -13,7 +13,12 @@ set(LLPRIMITIVE_INCLUDE_DIRS
if (WINDOWS)
set(LLPRIMITIVE_LIBRARIES
llprimitive
- libcollada14dom21
+ debug libcollada14dom21-d
+ debug libboost_filesystem-d
+ debug libboost_system-d
+ optimized libcollada14dom21
+ optimized libboost_filesystem
+ optimized libboost_system
)
else (WINDOWS)
set(LLPRIMITIVE_LIBRARIES
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 55a2fb7630..db2712f4f2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1498,6 +1498,9 @@ if (WINDOWS)
${SHARED_LIB_STAGING_DIR}/Release/glod.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/glod.dll
${SHARED_LIB_STAGING_DIR}/Debug/glod.dll
+ ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom21.dll
+ ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom21.dll
+ ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom21-d.dll
${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll
${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll