[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32313] trunk/lib/win64/opencollada: Update OpenCOLLADA libs to latest revision r771.
Nathan Letwory
nathan at letworyinteractive.com
Tue Oct 5 08:05:28 CEST 2010
Revision: 32313
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32313
Author: jesterking
Date: 2010-10-05 08:05:26 +0200 (Tue, 05 Oct 2010)
Log Message:
-----------
Update OpenCOLLADA libs to latest revision r771.
This revision now contains the two patches I had created (issues 116 and 117 on OpenCOLLADA issue tracker).
Note: after this commit another commit will follow to bring our Blender code in sync with this change (API rename).
Modified Paths:
--------------
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h
trunk/lib/win64/opencollada/lib/GeneratedSaxParser.lib
trunk/lib/win64/opencollada/lib/GeneratedSaxParser_d.lib
trunk/lib/win64/opencollada/lib/MathMLSolver.lib
trunk/lib/win64/opencollada/lib/MathMLSolver_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
trunk/lib/win64/opencollada/lib/buffer.lib
trunk/lib/win64/opencollada/lib/buffer_d.lib
trunk/lib/win64/opencollada/lib/ftoa.lib
trunk/lib/win64/opencollada/lib/ftoa_d.lib
trunk/lib/win64/opencollada/lib/pcre.lib
trunk/lib/win64/opencollada/lib/pcre_d.lib
trunk/lib/win64/opencollada/lib/xml2.lib
trunk/lib/win64/opencollada/lib/xml2_d.lib
Added Paths:
-----------
trunk/lib/win64/opencollada/blender_r771.diff
trunk/lib/win64/opencollada/compile_opencollada_rev771.txt
Removed Paths:
-------------
trunk/lib/win64/opencollada/blender_r769.diff
trunk/lib/win64/opencollada/compile_opencollada_rev769.txt
Deleted: trunk/lib/win64/opencollada/blender_r769.diff
===================================================================
--- trunk/lib/win64/opencollada/blender_r769.diff 2010-10-05 06:02:59 UTC (rev 32312)
+++ trunk/lib/win64/opencollada/blender_r769.diff 2010-10-05 06:05:26 UTC (rev 32313)
@@ -1,614 +0,0 @@
-Index: COLLADABaseUtils/include/COLLADABUPrerequisites.h
-===================================================================
---- COLLADABaseUtils/include/COLLADABUPrerequisites.h (revision 769)
-+++ COLLADABaseUtils/include/COLLADABUPrerequisites.h (working copy)
-@@ -25,7 +25,7 @@
- }
-
- #define COLLADABU_HAVE_TR1_UNORDERED_MAP
--#ifndef WIN32
-+#ifndef COLLADABU_OS_WIN
- #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
- #undef COLLADABU_HAVE_TR1_UNORDERED_MAP
- #else
-Index: COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj
-===================================================================
---- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (revision 769)
-+++ COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (working copy)
-@@ -443,11 +443,12 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-- WholeProgramOptimization="true"
-+ WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED"
- RuntimeLibrary="0"
- RuntimeTypeInfo="false"
-+ BufferSecurityCheck="false"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="COLLADABUStableHeaders.h"
- WarningLevel="3"
-@@ -466,6 +467,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-@@ -510,16 +512,17 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-- WholeProgramOptimization="true"
-+ WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED"
- RuntimeLibrary="0"
- RuntimeTypeInfo="false"
-+ BufferSecurityCheck="false"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="COLLADABUStableHeaders.h"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
-- DebugInformationFormat="3"
-+ DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -533,6 +536,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-Index: COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp
-===================================================================
---- COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (revision 769)
-+++ COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (working copy)
-@@ -6,6 +6,6 @@
- Licensed under the MIT Open Source License,
- for details please see LICENSE file or the website
- http://www.opensource.org/licenses/mit-license.php
--*/
--
--#include "COLLADABUStableHeaders.h"
-+*/
-+
-+#include "COLLADABUStableHeaders.h"
-Index: COLLADAFramework/include/COLLADAFWEffect.h
-===================================================================
---- COLLADAFramework/include/COLLADAFWEffect.h (revision 769)
-+++ COLLADAFramework/include/COLLADAFWEffect.h (working copy)
-@@ -47,8 +47,8 @@
-
- /**
- * The original object id, if it in the original file format exist.
-- */
-- String mOriginalId;
-+ */
-+ String mOriginalId;
-
- /**
- * Pretty-print name for this effect. Optional.
-@@ -87,12 +87,12 @@
-
- /**
- * The original object id, if it in the original file format exist.
-- */
-+ */
- const String& getOriginalId () const { return mOriginalId; }
-
- /**
- * The original object id, if it in the original file format exist.
-- */
-+ */
- void setOriginalId ( const String& val ) { mOriginalId = val; }
-
- /** Pretty-print name for this effect. Optional. */
-Index: COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h
-===================================================================
---- COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h (revision 769)
-+++ COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h (working copy)
-@@ -32,6 +32,9 @@
- /** The set index of the set of texture coordinates uses by the effect for parameter
- with parameter id. */
- size_t mSetIndex;
-+
-+ /** The semantic used for this texture coordinate binding (<bind_vertex_input> attribute semantic) */
-+ String mName;
-
- public:
-
-@@ -52,6 +55,9 @@
- with parameter id. */
- const size_t& getSetIndex () const { return mSetIndex; }
- void setSetIndex ( const size_t& val ) { mSetIndex = val; }
-+
-+ const String getName() const { return mName; }
-+ void setName( const String& val ) { mName = val; }
-
- /** Operator overloading. */
- bool operator<( const TextureCoordinateBinding& rhs) const
-Index: COLLADAFramework/scripts/COLLADAFramework.vcproj
-===================================================================
---- COLLADAFramework/scripts/COLLADAFramework.vcproj (revision 769)
-+++ COLLADAFramework/scripts/COLLADAFramework.vcproj (working copy)
-@@ -450,10 +450,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-- WholeProgramOptimization="true"
-+ WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- TreatWChar_tAsBuiltInType="true"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="2"
-@@ -474,6 +475,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-@@ -518,10 +520,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-- WholeProgramOptimization="true"
-+ WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- TreatWChar_tAsBuiltInType="true"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="2"
-@@ -542,6 +545,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-Index: COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj
-===================================================================
---- COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (revision 769)
-+++ COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (working copy)
-@@ -2071,10 +2071,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-- WholeProgramOptimization="true"
-+ WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- TreatWChar_tAsBuiltInType="true"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="2"
-@@ -2095,6 +2096,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-@@ -2139,10 +2141,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-- WholeProgramOptimization="true"
-+ WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- TreatWChar_tAsBuiltInType="true"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="2"
-@@ -2163,6 +2166,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-Index: COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader.cpp
-===================================================================
---- COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader.cpp (revision 769)
-+++ COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader.cpp (working copy)
-@@ -315,6 +315,7 @@
- {
- COLLADAFW::TextureCoordinateBinding texCoordinateBinding;
- texCoordinateBinding.setSetIndex ( (size_t)attributeData.input_set );
-+ texCoordinateBinding.setName( attributeData.semantic );
- texCoordinateBinding.setTextureMapId ( getHandlingFilePartLoader()->getTextureMapIdBySematic( attributeData.semantic ) );
- mCurrentTextureCoordinateBindings.insert(texCoordinateBinding);
- }
-Index: COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj
-===================================================================
---- COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (revision 769)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list