From c0d882fbff8b0bae584b25f57ebe614aeada6034 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 14 Oct 2010 11:26:59 -0500
Subject: Updated colladadom.
---
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/LLPrimitive.cmake | 7 ++++++-
indra/newview/CMakeLists.txt | 3 +++
install.xml | 4 ++--
4 files changed, 12 insertions(+), 4 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
diff --git a/install.xml b/install.xml
index cf689fd28e..b0421be92f 100644
--- a/install.xml
+++ b/install.xml
@@ -280,9 +280,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
- <string>6c2267ba2735bb5bc6229bc4366fce86</string>
+ <string>b4adc36b1476c125f1ee5681a6bc5e1e</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1.1-windows-20100129.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-windows-20101014a.tar.bz2</uri>
</map>
</map>
</map>
--
cgit v1.2.3