Revision: 34528
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34528
Author: jesterking
Date: 2011-01-27 14:40:44 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Update OpenCOLLADA to r827. Needs upcoming commit in trunk for OpenCOLLADA API
changes in r817.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=827
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=817
Modified Paths:
--------------
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWHashFunctions.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshVertexData.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWTexture.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLCOLLADACsymbol.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLDocumentProcessor.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFilePartLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFormulasLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIErrorHandler.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSidAddress.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryKinematicsModelsLoader15.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWInputList.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryAnimations.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryGeometries.h
trunk/lib/win64/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserParserTemplateBase.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/compile_opencollada_rev827.txt
trunk/lib/win64/opencollada/lib/UTF.lib
trunk/lib/win64/opencollada/lib/UTF_d.lib
Removed Paths:
-------------
trunk/lib/win64/opencollada/blender_r788.diff
trunk/lib/win64/opencollada/compile_opencollada_rev788.txt
Deleted: trunk/lib/win64/opencollada/blender_r788.diff
===================================================================
--- trunk/lib/win64/opencollada/blender_r788.diff 2011-01-27 12:36:48 UTC
(rev 34527)
+++ trunk/lib/win64/opencollada/blender_r788.diff 2011-01-27 14:40:44 UTC
(rev 34528)
@@ -1,535 +0,0 @@
-Index: COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj
-===================================================================
---- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (revision 788)
-+++ 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 788)
-+++ 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/scripts/COLLADAFramework.vcproj
-===================================================================
---- COLLADAFramework/scripts/COLLADAFramework.vcproj (revision 788)
-+++ 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 788)
-+++ 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: COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj
-===================================================================
---- COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (revision 788)
-+++ COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (working copy)
-@@ -440,9 +440,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-+ WholeProgramOptimization="false"
-
AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="0"
- WarningLevel="2"
-@@ -461,6 +463,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-@@ -505,9 +508,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-+ WholeProgramOptimization="false"
-
AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include"
-
PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="0"
- WarningLevel="2"
-@@ -526,6 +531,7 @@
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName).lib"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-Index: common/libBuffer/scripts/libBuffer.vcproj
-===================================================================
---- common/libBuffer/scripts/libBuffer.vcproj (revision 788)
-+++ common/libBuffer/scripts/libBuffer.vcproj (working copy)
-@@ -1316,9 +1316,11 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
-+ WholeProgramOptimization="false"
-
AdditionalIncludeDirectories="..\include;..\..\libftoa\include"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF"
- RuntimeLibrary="0"
-+ BufferSecurityCheck="false"
- RuntimeTypeInfo="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
-@@ -1336,6 +1338,7 @@
- />
- <Tool
- Name="VCLibrarianTool"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-@@ -1359,7 +1362,7 @@
-
IntermediateDirectory="..\obj\win\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
-- WholeProgramOptimization="1"
-+ WholeProgramOptimization="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
-@@ -1383,7 +1386,8 @@
-
AdditionalIncludeDirectories="..\include;..\..\libftoa\include"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF"
- RuntimeLibrary="0"
-- RuntimeTypeInfo="false"
-+ BufferSecurityCheck="false"
-+ RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
-@@ -1400,6 +1404,7 @@
- />
- <Tool
- Name="VCLibrarianTool"
-+ IgnoreAllDefaultLibraries="true"
- />
- <Tool
- Name="VCALinkTool"
-Index: common/libftoa/scripts/libftoa.vcproj
-===================================================================
---- common/libftoa/scripts/libftoa.vcproj (revision 788)
-+++ common/libftoa/scripts/libftoa.vcproj (working copy)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
