[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32237] trunk/lib/win64/opencollada: Updated OpenCOLLADA 64bit libraries for Windows.

Nathan Letwory nathan at letworyinteractive.com
Fri Oct 1 22:13:12 CEST 2010


Revision: 32237
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32237
Author:   jesterking
Date:     2010-10-01 22:13:12 +0200 (Fri, 01 Oct 2010)

Log Message:
-----------
Updated OpenCOLLADA 64bit libraries for Windows.

Modified Paths:
--------------
    trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h
    trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceBase.h
    trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h
    trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWTypes.h
    trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIFilePartLoader.h
    trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryEffectsLoader.h
    trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h
    trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h
    trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/generated14/COLLADASaxFWLLibraryEffectsLoader14.h
    trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryEffectsLoader15.h
    trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWEffectProfile.h
    trunk/lib/win64/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.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_r769.diff
    trunk/lib/win64/opencollada/compile_opencollada_rev769.txt

Removed Paths:
-------------
    trunk/lib/win64/opencollada/compile_opencollada_rev746.txt
    trunk/lib/win64/opencollada/compile_r746_forblender.patch

Copied: trunk/lib/win64/opencollada/blender_r769.diff (from rev 32187, trunk/lib/win64/opencollada/compile_r746_forblender.patch)
===================================================================
--- trunk/lib/win64/opencollada/blender_r769.diff	                        (rev 0)
+++ trunk/lib/win64/opencollada/blender_r769.diff	2010-10-01 20:13:12 UTC (rev 32237)
@@ -0,0 +1,524 @@
+Index: COLLADABaseUtils/include/COLLADABUPrerequisites.h
+===================================================================
+--- COLLADABaseUtils/include/COLLADABUPrerequisites.h	(revision 746)
++++ COLLADABaseUtils/include/COLLADABUPrerequisites.h	(working copy)
+@@ -25,7 +25,7 @@
+ #endif
+ #else
+ #  undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+-#  if defined(_MSC_VER) && (_MSC_VER >= 1500) \
++#  if defined(_MSC_VER) && (_MSC_VER >= 1600) \
+    && defined(_MSC_FULL_VER) && \
+    !defined(__SGI_STL_PORT) && \
+    !defined(_STLPORT_VERSION) && \
+Index: COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj
+===================================================================
+--- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj	(revision 746)
++++ COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj	(working copy)
+@@ -437,10 +437,11 @@
+ 			<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"
++				BufferSecurityCheck="false"
+ 				UsePrecompiledHeader="2"
+ 				PrecompiledHeaderThrough="COLLADABUStableHeaders.h"
+ 				WarningLevel="3"
+@@ -459,6 +460,7 @@
+ 			<Tool
+ 				Name="VCLibrarianTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).lib"
++				IgnoreAllDefaultLibraries="true"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -503,15 +505,16 @@
+ 			<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"
++				BufferSecurityCheck="false"
+ 				UsePrecompiledHeader="2"
+ 				PrecompiledHeaderThrough="COLLADABUStableHeaders.h"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="false"
+-				DebugInformationFormat="3"
++				DebugInformationFormat="0"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -525,6 +528,7 @@
+ 			<Tool
+ 				Name="VCLibrarianTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).lib"
++				IgnoreAllDefaultLibraries="true"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+Index: COLLADAFramework/scripts/COLLADAFramework.vcproj
+===================================================================
+--- COLLADAFramework/scripts/COLLADAFramework.vcproj	(revision 746)
++++ 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="true"
+ 				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 746)
++++ 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="true"
+ 				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 746)
++++ 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 746)
++++ 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,6 +1386,7 @@
+ 				AdditionalIncludeDirectories="..\include;..\..\libftoa\include"
+ 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF"
+ 				RuntimeLibrary="0"
++				BufferSecurityCheck="false"
+ 				RuntimeTypeInfo="true"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+@@ -1400,6 +1404,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLibrarianTool"
++				IgnoreAllDefaultLibraries="true"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+Index: common/libftoa/scripts/libftoa.vcproj
+===================================================================
+--- common/libftoa/scripts/libftoa.vcproj	(revision 746)
++++ common/libftoa/scripts/libftoa.vcproj	(working copy)
+@@ -1314,9 +1314,11 @@
+ 			<Tool

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list