[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24572] branches/soc-2009-chingachgook: COLLADA: updated cmake and scons settings (on linux) to build against OpenCollada @ 675.

[Arystanbek Dyussenov]

Revision: 24572
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24572
Author:   kazanbas
Date:     2009-11-15 14:57:37 +0100 (Sun, 15 Nov 2009)

Log Message:
-----------
COLLADA: updated cmake and scons settings (on linux) to build against OpenCollada @ 675.

To build OpenCollada:
* apply this patch http://wiki.blender.org/index.php/File:Opencollada@675.diff
* build by typing 'scons XMLPARSER=expatnative' (pcre and expat must be installed)
* after build, copy all compiled libs into 'lib' (Blender build will refer to it):

rm -rd lib
mkdir lib
find . -iname '*.a' | xargs cp -t lib

Modified Paths:
--------------
    branches/soc-2009-chingachgook/CMakeLists.txt
    branches/soc-2009-chingachgook/config/linux2-config.py

Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt	2009-11-15 11:46:08 UTC (rev 24571)
+++ branches/soc-2009-chingachgook/CMakeLists.txt	2009-11-15 13:57:37 UTC (rev 24572)
@@ -209,8 +209,8 @@
 
 	IF (WITH_OPENCOLLADA)
 		SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
-		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
-		SET(OPENCOLLADA_LIB OpenCollada)
+		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+		SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa Buffer)
 		SET(OPENCOLLADA_INC ${OPENCOLLADA})
 		SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
 		SET(PCRE_LIBPATH ${PCRE}/lib)

Modified: branches/soc-2009-chingachgook/config/linux2-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/linux2-config.py	2009-11-15 11:46:08 UTC (rev 24571)
+++ branches/soc-2009-chingachgook/config/linux2-config.py	2009-11-15 13:57:37 UTC (rev 24572)
@@ -155,9 +155,9 @@
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = ''
-BF_OPENCOLLADA_LIB = 'OpenCollada'
-BF_OPENCOLLADA_LIBPATH = '/usr/lib'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre Buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 BF_PCRE = ''
 BF_PCRE_LIB = 'pcre'
 BF_PCRE_LIBPATH = '/usr/lib'