Revision: 29278 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29278 Author: nazgul Date: 2010-06-06 20:12:19 +0200 (Sun, 06 Jun 2010)
Log Message: ----------- Updated collada libraries for mingw Modified Paths: -------------- trunk/lib/windows/gcc/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h trunk/lib/windows/gcc/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h trunk/lib/windows/gcc/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h trunk/lib/windows/gcc/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h trunk/lib/windows/gcc/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h trunk/lib/windows/gcc/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsController.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsModel.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsScene.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWLines.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitive.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWMeshVertexData.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWScene.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWTypes.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWUniqueId.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLDocumentProcessor.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIFilePartLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInputUnshared.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIntermediateTargetable.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsSceneCreator.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryArticulatedSystemsLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLMeshLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrerequisites.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSaxFWLError.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSceneLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLUtils.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLSceneLoader15.h trunk/lib/windows/gcc/opencollada/include/COLLADAStreamWriter/include/COLLADASWEffectProfile.h trunk/lib/windows/gcc/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibrary.h trunk/lib/windows/gcc/opencollada/lib/libGeneratedSaxParser.a trunk/lib/windows/gcc/opencollada/lib/libGeneratedSaxParser_d.a trunk/lib/windows/gcc/opencollada/lib/libMathMLSolver.a trunk/lib/windows/gcc/opencollada/lib/libMathMLSolver_d.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADABaseUtils.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADABaseUtils_d.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADAFramework.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADAFramework_d.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADASaxFrameworkLoader_d.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADAStreamWriter.a trunk/lib/windows/gcc/opencollada/lib/libOpenCOLLADAStreamWriter_d.a trunk/lib/windows/gcc/opencollada/lib/libUTF.a trunk/lib/windows/gcc/opencollada/lib/libUTF_d.a trunk/lib/windows/gcc/opencollada/lib/libbuffer.a trunk/lib/windows/gcc/opencollada/lib/libbuffer_d.a trunk/lib/windows/gcc/opencollada/lib/libexpat.a trunk/lib/windows/gcc/opencollada/lib/libexpat_d.a trunk/lib/windows/gcc/opencollada/lib/libftoa.a trunk/lib/windows/gcc/opencollada/lib/libftoa_d.a trunk/lib/windows/gcc/opencollada/lib/libpcre.a trunk/lib/windows/gcc/opencollada/lib/libpcre_d.a Added Paths: ----------- trunk/lib/windows/gcc/opencollada/compile_r746_forblender.patch trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWHashFunctions.h trunk/lib/windows/gcc/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceKinematicsScene.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInstanceArticulatedSystemLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInstanceKinematicsModelLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryKinematicsScenesLoader.h trunk/lib/windows/gcc/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15.h trunk/lib/windows/gcc/opencollada/prepare_lib-expat-mingw.sh trunk/lib/windows/gcc/opencollada/readme_rev746.txt Added: trunk/lib/windows/gcc/opencollada/compile_r746_forblender.patch =================================================================== --- trunk/lib/windows/gcc/opencollada/compile_r746_forblender.patch (rev 0) +++ trunk/lib/windows/gcc/opencollada/compile_r746_forblender.patch 2010-06-06 18:12:19 UTC (rev 29278) @@ -0,0 +1,535 @@ +diff --git a/COLLADABaseUtils/SConscript b/COLLADABaseUtils/SConscript +index d9bb25d..405dbc5 100644 +--- a/COLLADABaseUtils/SConscript ++++ b/COLLADABaseUtils/SConscript +@@ -23,6 +23,6 @@ for srcDir in srcDirs: + VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False) + + if env['SHAREDLIB']: +- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + else: +- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) +diff --git a/COLLADABaseUtils/include/COLLADABUPrerequisites.h b/COLLADABaseUtils/include/COLLADABUPrerequisites.h +index 1dd740f..044a6ac 100644 +--- a/COLLADABaseUtils/include/COLLADABUPrerequisites.h ++++ b/COLLADABaseUtils/include/COLLADABUPrerequisites.h +@@ -37,7 +37,7 @@ + # endif + #endif + #ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP +-# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC) ++# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC) || defined(__MINGW32__) + # include <ext/hash_map> + # include <ext/hash_set> + # else +diff --git a/COLLADABaseUtils/include/COLLADABUStringUtils.h b/COLLADABaseUtils/include/COLLADABUStringUtils.h +index a7d7c60..4958112 100644 +--- a/COLLADABaseUtils/include/COLLADABUStringUtils.h ++++ b/COLLADABaseUtils/include/COLLADABUStringUtils.h +@@ -16,6 +16,7 @@ + + #include <sstream> + #include <fstream> ++#include <sstream> + #include <map> + + namespace COLLADABU +@@ -156,7 +157,11 @@ namespace COLLADABU + template<class T> + static WideString toWideString ( const T & value ) + { ++#ifdef __MINGW32__ ++ std::basic_stringstream<wchar_t> stream; ++#else + std::wstringstream stream; ++#endif + stream << value; + return WideString(stream.str()); + } +diff --git a/COLLADABaseUtils/include/COLLADABUURI.h b/COLLADABaseUtils/include/COLLADABUURI.h +index 7684d45..a6319d0 100644 +--- a/COLLADABaseUtils/include/COLLADABUURI.h ++++ b/COLLADABaseUtils/include/COLLADABUURI.h +@@ -399,10 +399,20 @@ namespace COLLADABU + + }; + ++} + +- ++#if defined(__MINGW32__) ++# include "COLLADABUhash_map.h" + ++namespace __gnu_cxx ++{ ++ template<> struct hash<COLLADABU::URI> { ++ size_t operator()(const COLLADABU::URI& uri) const { ++ return uri; ++ } ++ }; + } ++#endif + + + #endif //__COLLADAFW_URI_H__ +diff --git a/COLLADABaseUtils/include/COLLADABUhash_map.h b/COLLADABaseUtils/include/COLLADABUhash_map.h +index 7be920d..44c4965 100644 +--- a/COLLADABaseUtils/include/COLLADABUhash_map.h ++++ b/COLLADABaseUtils/include/COLLADABUhash_map.h +@@ -39,7 +39,7 @@ namespace COLLADABU + hash_set&operator=(const hash_set&a){std::tr1::unordered_set<X>::operator=(*this,a);return this;} + }; + #else +-# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC) ++# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC) || defined(__MINGW32__) + using namespace __gnu_cxx; + # else + using namespace stdext; +@@ -49,4 +49,17 @@ namespace COLLADABU + + } // namespace COLLADABU + ++#if defined(__MINGW32__) ++#include <string> ++ ++namespace __gnu_cxx ++{ ++ template<> struct hash<std::string> { ++ size_t operator()(const std::string& s) const { ++ return __stl_hash_string(s.c_str()); ++ } ++ }; ++} ++#endif ++ + #endif // __COLLADABU_HASH_MAP_H__ +diff --git a/COLLADABaseUtils/scripts/SConscript b/COLLADABaseUtils/scripts/SConscript +index ff76200..ced3203 100644 +--- a/COLLADABaseUtils/scripts/SConscript ++++ b/COLLADABaseUtils/scripts/SConscript +@@ -19,6 +19,6 @@ for srcDir in srcDirs: + VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False) + + if env['SHAREDLIB']: +- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + else: +- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) +diff --git a/COLLADAFramework/SConscript b/COLLADAFramework/SConscript +index d279ad3..31031f9 100644 +--- a/COLLADAFramework/SConscript ++++ b/COLLADAFramework/SConscript +@@ -20,7 +20,7 @@ src = [ variantDir + str(p) for p in Glob(srcDir + '*.cpp')] + VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False) + + if env['SHAREDLIB']: +- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + else: +- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + +diff --git a/COLLADAFramework/include/COLLADAFWUniqueId.h b/COLLADAFramework/include/COLLADAFWUniqueId.h +index 15f1599..fb6a70f 100644 +--- a/COLLADAFramework/include/COLLADAFWUniqueId.h ++++ b/COLLADAFramework/include/COLLADAFWUniqueId.h +@@ -91,4 +91,17 @@ namespace COLLADAFW + + } // namespace COLLADAFW + ++#if defined(__MINGW32__) ++# include "COLLADABUhash_map.h" ++ ++namespace __gnu_cxx ++{ ++ template<> struct hash<COLLADAFW::UniqueId> { ++ size_t operator()(const COLLADAFW::UniqueId& id) const { ++ return id; ++ } ++ }; ++} ++#endif ++ + #endif // __COLLADAFW_UNIQUEID_H__ +diff --git a/COLLADAFramework/scripts/SConscript b/COLLADAFramework/scripts/SConscript +index ffd171d..a123369 100644 +--- a/COLLADAFramework/scripts/SConscript ++++ b/COLLADAFramework/scripts/SConscript +@@ -20,7 +20,7 @@ src = [ variantDir + str(p) for p in Glob(srcDir + '*.cpp')] + VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False) + + if env['SHAREDLIB']: +- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + else: +- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + +diff --git a/COLLADASaxFrameworkLoader/SConscript b/COLLADASaxFrameworkLoader/SConscript +index ab45e93..cfe06ae 100644 +--- a/COLLADASaxFrameworkLoader/SConscript ++++ b/COLLADASaxFrameworkLoader/SConscript +@@ -41,6 +41,6 @@ if not env['NOVALIDATION']: + + + if env['SHAREDLIB']: +- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + else: +- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) +diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h +index 3e22691..c076639 100644 +--- a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h ++++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h +@@ -13,6 +13,7 @@ + + #include "COLLADASaxFWLPrerequisites.h" + #include "COLLADASaxFWLUtils.h" ++ + #include "COLLADASaxFWLSidAddress.h" + #include "COLLADASaxFWLIntermediateTargetable.h" + +@@ -24,7 +25,6 @@ + + #include <list> + +- + namespace COLLADAFW + { + class Joint; +diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrerequisites.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrerequisites.h +index 0ab6861..53be71f 100644 +--- a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrerequisites.h ++++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrerequisites.h +@@ -11,6 +11,26 @@ + #ifndef __COLLADASAXFWL_PREREQUISITES_H__ + #define __COLLADASAXFWL_PREREQUISITES_H__ + ++/* __gnu_cxx::hash should be changed before instantiation */ ++/* (which could be done in stl includes). So keep this here */ ++#if defined(__MINGW32__) ++#include "COLLADABUhash_map.h" ++ ++namespace COLLADASaxFWL ++{ ++ class KinematicsModel; ++} ++ ++namespace __gnu_cxx ++{ ++ template<> struct hash<COLLADASaxFWL::KinematicsModel*> { ++ size_t operator()(COLLADASaxFWL::KinematicsModel* const& model) const { ++ return reinterpret_cast<size_t>(model); ++ } ++ }; ++} ++#endif ++ + #include <cstddef> + #include <limits> + +diff --git a/COLLADAStreamWriter/SConscript b/COLLADAStreamWriter/SConscript +index 94e1703..93aff53 100644 +--- a/COLLADAStreamWriter/SConscript ++++ b/COLLADAStreamWriter/SConscript +@@ -20,7 +20,7 @@ src = [ variantDir + str(p) for p in Glob(srcDir + '*.cpp')] + VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False) + + if env['SHAREDLIB']: +- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + else: +- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) ++ env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS']) + +diff --git a/COLLADAValidator/SConscript b/COLLADAValidator/SConscript +index de20868..9b45af9 100644 +--- a/COLLADAValidator/SConscript ++++ b/COLLADAValidator/SConscript +@@ -64,5 +64,5 @@ if not env['SHAREDLIB']: + linkFlags += ['-static'] + + +-Program(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'], LIBS=libs, LIBPATH=libPath, LINKFLAGS=linkFlags) ++env.Program(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'], LIBS=libs, LIBPATH=libPath, LINKFLAGS=linkFlags) + +diff --git a/Externals/LibXML/SConscript b/Externals/LibXML/SConscript +index a105947..3a9ffb1 100644 +--- a/Externals/LibXML/SConscript ++++ b/Externals/LibXML/SConscript @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs