Revision: 46556
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46556
Author: jesterking
Date: 2012-05-11 17:29:55 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Enable OpenCOLLADA support for MingW64 builds by default.
Note: don't forget to update your local checkout of lib/mingw64
Modified Paths:
--------------
trunk/blender/build_files/scons/config/win64-mingw-config.py
Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py
2012-05-11 17:25:19 UTC (rev 46555)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py
2012-05-11 17:29:55 UTC (rev 46556)
@@ -137,14 +137,14 @@
'${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
'${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
-WITH_BF_COLLADA = False # TODO: Compile Collada with MinGW-w64
+WITH_BF_COLLADA = True
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
pcre buffer ftoa xml'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
#Cycles
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
