From d490081fe29adabfd3a2dba81f5e65d90db3fb51 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 8 Apr 2011 17:12:26 -0400
Subject: changes for newer collada build

---
 autobuild.xml                      | 52 +++++++++++++++++++-------------------
 indra/cmake/Copy3rdPartyLibs.cmake |  4 +--
 indra/cmake/LLPrimitive.cmake      |  4 +--
 indra/newview/CMakeLists.txt       |  6 ++---
 4 files changed, 33 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 indra/cmake/Copy3rdPartyLibs.cmake
 mode change 100644 => 100755 indra/cmake/LLPrimitive.cmake
 mode change 100644 => 100755 indra/newview/CMakeLists.txt

diff --git a/autobuild.xml b/autobuild.xml
index ee401cc63a..392cdbabea 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3,30 +3,6 @@
 <map>
     <key>installables</key>
     <map>
-      <key>glext</key>
-      <map>
-        <key>license</key>
-        <string>glext</string>
-        <key>license_file</key>
-        <string>LICENSES/glext.txt</string>
-        <key>name</key>
-        <string>glext</string>
-        <key>platforms</key>
-        <map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>5de58ca0fe19abf68b25956762ee0d29</string>
-              <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
-        </map>
-      </map>
       <key>GLOD</key>
       <map>
         <key>license</key>
@@ -282,9 +258,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c1e79c9d3084727be35ce140db87717e</string>
+              <string>9667a5cde31fd8957e07b61f643d8404</string>
               <key>url</key>
-              <string>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/colladadom-2.1-windows-20110223.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226086/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -603,6 +579,30 @@
           </map>
         </map>
       </map>
+      <key>glext</key>
+      <map>
+        <key>license</key>
+        <string>glext</string>
+        <key>license_file</key>
+        <string>LICENSES/glext.txt</string>
+        <key>name</key>
+        <string>glext</string>
+        <key>platforms</key>
+        <map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>5de58ca0fe19abf68b25956762ee0d29</string>
+              <key>url</key>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+        </map>
+      </map>
       <key>glh_linear</key>
       <map>
         <key>license</key>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
old mode 100644
new mode 100755
index a301a8d6ba..d4c478c3c7
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -39,7 +39,7 @@ if(WINDOWS)
         libapriconv-1.dll
         ssleay32.dll
         libeay32.dll
-        libcollada14dom21-d.dll
+        libcollada14dom22-d.dll
         glod.dll	
         )
 
@@ -51,7 +51,7 @@ if(WINDOWS)
         libapriconv-1.dll
         ssleay32.dll
         libeay32.dll
-        libcollada14dom21.dll
+        libcollada14dom22.dll
         glod.dll
         )
 
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
old mode 100644
new mode 100755
index 4bdbfe46e2..4d6a84b29e
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -14,8 +14,8 @@ if (WINDOWS)
 	set(LLPRIMITIVE_LIBRARIES 
         debug llprimitive
         optimized llprimitive
-        debug libcollada14dom21-d
-        optimized libcollada14dom21
+        debug libcollada14dom22-d
+        optimized libcollada14dom22
         debug libboost_filesystem-d
         optimized libboost_filesystem
         debug libboost_system-d
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
old mode 100644
new mode 100755
index 3ed10c08ab..d70f3ec337
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1489,9 +1489,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/libcollada14dom22.dll
+      ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom22.dll
+      ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom22-d.dll
       ${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll
       ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll
       ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll
-- 
cgit v1.2.3