Revision: 29257
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29257
Author: jesterking
Date: 2010-06-06 02:57:48 +0200 (Sun, 06 Jun 2010)
Log Message:
-----------
Add instructions and patch for building OpenCOLLADA r746
Added Paths:
-----------
trunk/lib/win64/opencollada/compile_opencollada_rev746.txt
trunk/lib/win64/opencollada/compile_r746_forblender.patch
Added: trunk/lib/win64/opencollada/compile_opencollada_rev746.txt
===================================================================
--- trunk/lib/win64/opencollada/compile_opencollada_rev746.txt
(rev 0)
+++ trunk/lib/win64/opencollada/compile_opencollada_rev746.txt 2010-06-06
00:57:48 UTC (rev 29257)
@@ -0,0 +1,12 @@
+1. checkout collada libs rev 746
+svn checkout -r 746 http://opencollada.googlecode.com/svn/trunk/
+
+2. Apply patch compile_r746_forblender.patch
+
+3. Open up the COLLADAMaya solution file
+4. Select ReleaseConsole2008 and Win64
+5. Build: COLLADABaseUtils, COLLADAFrameWork, COLLADASaxFrameworkLoader,
+ COLLADAStreamWriter, GeneratedSaxParser (this will also have libBuffer,
+ libftoa, LibXML, MathMLSolver and pcre compiled)
+6. For each project search in its respective directory and copy them in
+ place in lib/windows/opencollada/lib. Do renaming as needed
Added: trunk/lib/win64/opencollada/compile_r746_forblender.patch
===================================================================
--- trunk/lib/win64/opencollada/compile_r746_forblender.patch
(rev 0)
+++ trunk/lib/win64/opencollada/compile_r746_forblender.patch 2010-06-06
00:57:48 UTC (rev 29257)
@@ -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"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
