[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37656] trunk/lib/windows/opencollada: Update libraries for win32, small patch for [#24747], which has been submitted upstream as http://code.google.com/p/opencollada/ issues/detail?id=164
Nathan Letwory
nathan at letworyinteractive.com
Mon Jun 20 11:26:18 CEST 2011
Revision: 37656
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37656
Author: jesterking
Date: 2011-06-20 09:26:17 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Update libraries for win32, small patch for [#24747], which has been submitted upstream as http://code.google.com/p/opencollada/issues/detail?id=164
Modified Paths:
--------------
trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h
trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h
trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWPrimitves.h
trunk/lib/windows/opencollada/lib/GeneratedSaxParser.lib
trunk/lib/windows/opencollada/lib/GeneratedSaxParser_d.lib
trunk/lib/windows/opencollada/lib/MathMLSolver.lib
trunk/lib/windows/opencollada/lib/MathMLSolver_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
trunk/lib/windows/opencollada/lib/UTF.lib
trunk/lib/windows/opencollada/lib/UTF_d.lib
trunk/lib/windows/opencollada/lib/buffer.lib
trunk/lib/windows/opencollada/lib/buffer_d.lib
trunk/lib/windows/opencollada/lib/ftoa.lib
trunk/lib/windows/opencollada/lib/ftoa_d.lib
trunk/lib/windows/opencollada/lib/pcre.lib
trunk/lib/windows/opencollada/lib/pcre_d.lib
trunk/lib/windows/opencollada/lib/xml2.lib
trunk/lib/windows/opencollada/lib/xml2_d.lib
Added Paths:
-----------
trunk/lib/windows/opencollada/compile_opencollada_rev839.txt
Removed Paths:
-------------
trunk/lib/windows/opencollada/compile_opencollada_rev836.txt
Deleted: trunk/lib/windows/opencollada/compile_opencollada_rev836.txt
===================================================================
--- trunk/lib/windows/opencollada/compile_opencollada_rev836.txt 2011-06-20 09:08:41 UTC (rev 37655)
+++ trunk/lib/windows/opencollada/compile_opencollada_rev836.txt 2011-06-20 09:26:17 UTC (rev 37656)
@@ -1,9 +0,0 @@
-1. checkout collada libs rev 836
-svn checkout -r 836 http://opencollada.googlecode.com/svn/trunk/
-
-2. Create projectfiles using CMake
-3. Open up the OPENCOLLADA solution file
-4. Set code generation to /MT[d]
-5. Build release and debug targets
-6. For each project search in its respective directory and copy them in
- place in lib/windows/opencollada/lib. Do renaming as needed (ie. prepend Open, for debug _d, xml.lib to xml2.lib and so on).
Copied: trunk/lib/windows/opencollada/compile_opencollada_rev839.txt (from rev 37655, trunk/lib/windows/opencollada/compile_opencollada_rev836.txt)
===================================================================
--- trunk/lib/windows/opencollada/compile_opencollada_rev839.txt (rev 0)
+++ trunk/lib/windows/opencollada/compile_opencollada_rev839.txt 2011-06-20 09:26:17 UTC (rev 37656)
@@ -0,0 +1,10 @@
+1. checkout collada libs rev 839
+svn checkout -r 839 http://opencollada.googlecode.com/svn/trunk/
+
+2. Apply patches from http://code.google.com/p/opencollada/issues/detail?id=164
+3. Set code generation to /MT[d] in CMake settings
+4. Create projectfiles using CMake
+5. Open up the OPENCOLLADA solution file
+6. Build release and debug targets
+7. For each project search in its respective directory and copy them in
+ place in lib/windows/opencollada/lib. Do renaming as needed (ie. for debug _d, xml.lib to xml2.lib and so on).
Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h 2011-06-20 09:08:41 UTC (rev 37655)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h 2011-06-20 09:26:17 UTC (rev 37656)
@@ -41,6 +41,8 @@
# define COLLADABU_DEBUG
#endif
+#include <cassert>
+
#if defined(COLLADABU_DEBUG)
# define COLLADABU_ASSERT(cond) assert(cond);
#else
Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h 2011-06-20 09:08:41 UTC (rev 37655)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h 2011-06-20 09:26:17 UTC (rev 37656)
@@ -23,6 +23,7 @@
#include <hash_set>
#define COLLADABU_HASH_MAP stdext::hash_map
+ #define COLLADABU_HASH_MULTIMAP stdext::hash_multimap
#define COLLADABU_HASH_SET stdext::hash_set
#define COLLADABU_HASH_NAMESPACE_OPEN stdext
#define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -32,6 +33,7 @@
#include <unordered_set>
#define COLLADABU_HASH_MAP std::tr1::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
#define COLLADABU_HASH_SET std::tr1::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
#define COLLADABU_HASH_NAMESPACE_CLOSE }
@@ -40,7 +42,8 @@
#include <unordered_map>
#include <unordered_set>
- #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
#define COLLADABU_HASH_SET std::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std
#define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -76,7 +79,8 @@
};
}
- #define COLLADABU_HASH_MAP __gnu_cxx::hash_map
+ #define COLLADABU_HASH_MAP __gnu_cxx::hash_map
+ #define COLLADABU_HASH_MULTIMAP __gnu_cxx::hash_multimap
#define COLLADABU_HASH_SET __gnu_cxx::hash_set
#define COLLADABU_HASH_NAMESPACE_OPEN __gnu_cxx
#define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -85,7 +89,8 @@
#include <tr1/unordered_map>
#include <tr1/unordered_set>
- #define COLLADABU_HASH_MAP std::tr1::unordered_map
+ #define COLLADABU_HASH_MAP std::tr1::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
#define COLLADABU_HASH_SET std::tr1::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
#define COLLADABU_HASH_NAMESPACE_CLOSE }
@@ -96,16 +101,26 @@
namespace COLLADABU
{
// typedef COLLADABU_HASH_MAP<X, Y> hash_map<X, Y>; // Unfortunately, this is not possible...
- template<class X, class Y>
- class hash_map : public COLLADABU_HASH_MAP<X,Y>
- {
- public:
+ template<class X, class Y>
+ class hash_map : public COLLADABU_HASH_MAP<X,Y>
+ {
+ public:
- hash_map() {}
- hash_map(const hash_map& a) : COLLADABU_HASH_MAP<X,Y>(a) {}
- hash_map& operator = (const hash_map& a) { COLLADABU_HASH_MAP<X,Y>::operator = (*this, a); return this; }
- };
+ hash_map() {}
+ hash_map(const hash_map& a) : COLLADABU_HASH_MAP<X,Y>(a) {}
+ hash_map& operator = (const hash_map& a) { COLLADABU_HASH_MAP<X,Y>::operator = (*this, a); return this; }
+ };
+ template<class X, class Y>
+ class hash_multimap : public COLLADABU_HASH_MULTIMAP<X,Y>
+ {
+ public:
+
+ hash_multimap() {}
+ hash_multimap(const hash_multimap& a) : COLLADABU_HASH_MULTIMAP<X,Y>(a) {}
+ hash_multimap& operator = (const hash_multimap& a) { COLLADABU_HASH_MULTIMAP<X,Y>::operator = (*this, a); return this; }
+ };
+
template<class X>
class hash_set : public COLLADABU_HASH_SET<X>
{
Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h 2011-06-20 09:08:41 UTC (rev 37655)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h 2011-06-20 09:26:17 UTC (rev 37656)
@@ -15,10 +15,8 @@
#include "COLLADABUMathPrerequisites.h"
#include "COLLADABUMathQuaternion.h"
-#include <assert.h>
#include <math.h>
-
namespace COLLADABU
{
namespace Math
Modified: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h 2011-06-20 09:08:41 UTC (rev 37655)
+++ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h 2011-06-20 09:26:17 UTC (rev 37656)
@@ -21,7 +21,6 @@
#include "COLLADAFWArray.h"
#include "COLLADAFWArrayPrimitiveType.h"
#include "COLLADAFWCamera.h"
-//#include "COLLADAFWCode.h"
#include "COLLADAFWColor.h"
#include "COLLADAFWColorOrTexture.h"
#include "COLLADAFWConstants.h"
@@ -41,7 +40,6 @@
#include "COLLADAFWIWriter.h"
#include "COLLADAFWImage.h"
#include "COLLADAFWImageSource.h"
-//#include "COLLADAFWInclude.h"
#include "COLLADAFWIndexList.h"
#include "COLLADAFWInstanceCamera.h"
#include "COLLADAFWInstanceController.h"
@@ -57,6 +55,7 @@
#include "COLLADAFWKinematicsScene.h"
#include "COLLADAFWLibraryNodes.h"
#include "COLLADAFWLight.h"
+#include "COLLADAFWLinestrips.h"
#include "COLLADAFWLoaderUtils.h"
#include "COLLADAFWLookat.h"
#include "COLLADAFWMaterial.h"
@@ -65,22 +64,13 @@
#include "COLLADAFWMeshPrimitive.h"
#include "COLLADAFWMeshPrimitiveWithFaceVertexCount.h"
#include "COLLADAFWMeshVertexData.h"
-//#include "COLLADAFWModifier.h"
#include "COLLADAFWMorphController.h"
#include "COLLADAFWMotionProfile.h"
-//#include "COLLADAFWNewParam.h"
#include "COLLADAFWNode.h"
#include "COLLADAFWObject.h"
#include "COLLADAFWParam.h"
-// #include "COLLADAFWPass.h"
-// #include "COLLADAFWPassClear.h"
-// #include "COLLADAFWPassOutput.h"
-// #include "COLLADAFWPassTarget.h"
#include "COLLADAFWPointerArray.h"
#include "COLLADAFWPolygons.h"
-// #include "COLLADAFWRenderDraw.h"
-// #include "COLLADAFWRenderState.h"
-// #include "COLLADAFWRenderStateStatic.h"
#include "COLLADAFWRoot.h"
#include "COLLADAFWRotate.h"
#include "COLLADAFWSampler.h"
@@ -88,12 +78,6 @@
#include "COLLADAFWScene.h"
#include "COLLADAFWSemantic.h"
#include "COLLADAFWSetParam.h"
-// #include "COLLADAFWShader.h"
-// #include "COLLADAFWShaderBlinn.h"
-// #include "COLLADAFWShaderConstantFX.h"
-// #include "COLLADAFWShaderElement.h"
-// #include "COLLADAFWShaderLambert.h"
-// #include "COLLADAFWShaderPhong.h"
#include "COLLADAFWShear.h"
#include "COLLADAFWSkew.h"
#include "COLLADAFWSkinController.h"
Modified: trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWPrimitves.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWPrimitves.h 2011-06-20 09:08:41 UTC (rev 37655)
+++ trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWPrimitves.h 2011-06-20 09:26:17 UTC (rev 37656)
@@ -17,7 +17,6 @@
#include "COLLADASWConstants.h"
#include <vector>
-#include <assert.h>
#include <string.h>
namespace COLLADASW
Modified: trunk/lib/windows/opencollada/lib/GeneratedSaxParser.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/opencollada/lib/GeneratedSaxParser_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/opencollada/lib/MathMLSolver.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/opencollada/lib/MathMLSolver_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework.lib
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list