[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24689] trunk/lib/windows/opencollada: OpenCOLLADA libs for msvc win32 debug target
Andrea Weikert
elubie at gmx.net
Thu Nov 19 21:55:46 CET 2009
Revision: 24689
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24689
Author: elubie
Date: 2009-11-19 21:55:45 +0100 (Thu, 19 Nov 2009)
Log Message:
-----------
OpenCOLLADA libs for msvc win32 debug target
* added compile instructions for the OpenCOLLADA libs
* added patch to the OpenCOLLADA libs for building with scons for blender by Nathan Letwory (jesterKing)
Added Paths:
-----------
trunk/lib/windows/opencollada/compile_opencollada.txt
trunk/lib/windows/opencollada/lib/GeneratedSaxParser_d.lib
trunk/lib/windows/opencollada/lib/MathMLSolver_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
trunk/lib/windows/opencollada/lib/UTF_d.lib
trunk/lib/windows/opencollada/lib/pcre_d.lib
trunk/lib/windows/opencollada/lib/xml2_d.lib
trunk/lib/windows/opencollada/msvc_debug_r641.patch
Added: trunk/lib/windows/opencollada/compile_opencollada.txt
===================================================================
--- trunk/lib/windows/opencollada/compile_opencollada.txt (rev 0)
+++ trunk/lib/windows/opencollada/compile_opencollada.txt 2009-11-19 20:55:45 UTC (rev 24689)
@@ -0,0 +1,15 @@
+1. checkout collada libs rev 641
+svn checkout -r 641 http://opencollada.googlecode.com/svn/trunk/
+
+2. compile libxml
+* cd to opencollada\Externals\LibXML\win32
+* (for release change /MTd to /MD and set buildDebug=false in configure.js
+* run configure.js
+* run nmake /f Makefile.msvc
+* copy libxml2_a to lib/windows/opencollada/xml2_d.lib
+
+3. compile Opencollada
+* For debug: scons RELEASE=0 NOVALIDATION=1 XMLPARSER=libxml PCRENATIVE=0 SHAREDLIB=0
+* For release: scons RELEASE=1 NOVALIDATION=1 XMLPARSER=libxml PCRENATIVE=0 SHAREDLIB=0
+
+4. find the libs in the /lib/win32/x86/debug subfolders and copy them to lib/windows/opencollada
Property changes on: trunk/lib/windows/opencollada/compile_opencollada.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/windows/opencollada/lib/GeneratedSaxParser_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/GeneratedSaxParser_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/MathMLSolver_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/MathMLSolver_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/UTF_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/UTF_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/pcre_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/pcre_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/lib/xml2_d.lib
===================================================================
(Binary files differ)
Property changes on: trunk/lib/windows/opencollada/lib/xml2_d.lib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/windows/opencollada/msvc_debug_r641.patch
===================================================================
--- trunk/lib/windows/opencollada/msvc_debug_r641.patch (rev 0)
+++ trunk/lib/windows/opencollada/msvc_debug_r641.patch 2009-11-19 20:55:45 UTC (rev 24689)
@@ -0,0 +1,1284 @@
+Index: COLLADABaseUtils/SConscript
+===================================================================
+--- COLLADABaseUtils/SConscript (revision 641)
++++ COLLADABaseUtils/SConscript (working copy)
+@@ -3,7 +3,6 @@
+
+ libName = 'OpenCOLLADABaseUtils'
+
+-
+ srcDirs = [ 'src/', 'src/Math/']
+
+ variantDir = env['objDir'] + env['configurationBaseName'] + '/'
+@@ -25,4 +24,4 @@
+ if env['SHAREDLIB']:
+ 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'] + ' -DPCRE_STATIC')
+Index: COLLADAFramework/SConscript
+===================================================================
+--- COLLADAFramework/SConscript (revision 641)
++++ COLLADAFramework/SConscript (working copy)
+@@ -22,5 +22,5 @@
+ if env['SHAREDLIB']:
+ 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'])
+
+Index: COLLADASaxFrameworkLoader/SConscript
+===================================================================
+--- COLLADASaxFrameworkLoader/SConscript (revision 641)
++++ COLLADASaxFrameworkLoader/SConscript (working copy)
+@@ -3,13 +3,15 @@
+
+ libName = 'OpenCOLLADASaxFrameworkLoader'
+
++fwl_env = env.Clone()
+
++
+ srcDirs = [ 'src/',
+ 'src/generated14/',
+ 'src/generated15/']
+
+-variantDir = env['objDir'] + env['configurationBaseName'] + env['xmlParserConfName'] + env['validationConfName'] + '/'
+-outputDir = env['libDir'] + env['configurationBaseName'] + env['xmlParserConfName'] + env['validationConfName'] + '/'
++variantDir = fwl_env['objDir'] + fwl_env['configurationBaseName'] + fwl_env['xmlParserConfName'] + fwl_env['validationConfName'] + '/'
++outputDir = fwl_env['libDir'] + fwl_env['configurationBaseName'] + fwl_env['xmlParserConfName'] + fwl_env['validationConfName'] + '/'
+ targetPath = outputDir + libName
+
+
+@@ -23,24 +25,24 @@
+ '../Externals/MathMLSolver/include',
+ '../Externals/MathMLSolver/include/AST']
+
+-if not env['PCRENATIVE']:
++if not fwl_env['PCRENATIVE']:
+ incDirs += ['../Externals/pcre/include']
+
+ src = []
+ for srcDir in srcDirs:
+ src += [ variantDir + str(p) for p in Glob(srcDir + '*.cpp')]
+- VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False)
++ fwl_env.VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False)
+
+-if (env['XMLPARSER'] == 'expat') or (env['XMLPARSER'] == 'expatnative'):
+- env['CPPFLAGS'] += ' -DGENERATEDSAXPARSER_XMLPARSER_EXPAT'
++if (fwl_env['XMLPARSER'] == 'expat') or (fwl_env['XMLPARSER'] == 'expatnative'):
++ fwl_env['CPPFLAGS'] += ' -DGENERATEDSAXPARSER_XMLPARSER_EXPAT'
+ else:
+- env['CPPFLAGS'] += ' -DGENERATEDSAXPARSER_XMLPARSER_LIBXML'
++ fwl_env['CPPFLAGS'] += ' -DGENERATEDSAXPARSER_XMLPARSER_LIBXML'
+
+-if not env['NOVALIDATION']:
+- env['CPPFLAGS'] += ' -DGENERATEDSAXPARSER_VALIDATION'
++if not fwl_env['NOVALIDATION']:
++ fwl_env['CPPFLAGS'] += ' -DGENERATEDSAXPARSER_VALIDATION'
+
+
+-if env['SHAREDLIB']:
+- SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'])
++if fwl_env['SHAREDLIB']:
++ SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=fwl_env['CPPFLAGS'])
+ else:
+- StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'])
++ fwl_env.StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=fwl_env['CPPFLAGS'])
+Index: COLLADAStreamWriter/SConscript
+===================================================================
+--- COLLADAStreamWriter/SConscript (revision 641)
++++ COLLADAStreamWriter/SConscript (working copy)
+@@ -20,5 +20,5 @@
+ if env['SHAREDLIB']:
+ 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'])
+
+Index: Externals/LibXML/config.h
+===================================================================
+--- Externals/LibXML/config.h (revision 641)
++++ Externals/LibXML/config.h (working copy)
+@@ -6,11 +6,11 @@
+ #define HAVE_MALLOC_H
+ #define HAVE_ERRNO_H
+
+-#ifdef _WIN32_WCE
++#if defined(_WIN32_WCE)
+ #undef HAVE_ERRNO_H
+ #include <windows.h>
+ #include "wincecompat.h"
+-#elif defined(WIN32)
++#else
+ #define HAVE_SYS_STAT_H
+ #define HAVE__STAT
+ #define HAVE_STAT
+@@ -23,14 +23,22 @@
+
+ #include <libxml/xmlversion.h>
+
++#ifndef ICONV_CONST
++#define ICONV_CONST const
++#endif
++
+ #ifdef NEED_SOCKETS
+ #include <wsockcompat.h>
+ #endif
+
++/*
++ * Windows platforms may define except
++ */
++#undef except
++
+ #define HAVE_ISINF
+ #define HAVE_ISNAN
+ #include <math.h>
+-#ifdef WIN32
+ #if defined(_MSC_VER) || defined(__BORLANDC__)
+ /* MS C-runtime has functions which can be used in order to determine if
+ a given floating-point variable contains NaN, (+-)INF. These are
+@@ -84,18 +92,21 @@
+ }
+ #endif
+ #endif /* _MSC_VER */
+-#endif // WIN32
+
+-#if defined(_MSC_VER) || defined(__MINGW32__)
++#if defined(_MSC_VER)
+ #define mkdir(p,m) _mkdir(p)
+ #define snprintf _snprintf
++#if _MSC_VER < 1500
+ #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+ #endif
++#elif defined(__MINGW32__)
++#define mkdir(p,m) _mkdir(p)
++#endif
+
+ /* Threading API to use should be specified here for compatibility reasons.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list