From b91beefdb7f2def2fa7a0a18bc39902c45c72076 Mon Sep 17 00:00:00 2001 From: Arystanbek Dyussenov Date: Sun, 15 Nov 2009 13:57:37 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 4 ++-- config/linux2-config.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01f1dd69a9a..db9e5948f33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,8 +209,8 @@ IF(UNIX AND NOT APPLE) 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) diff --git a/config/linux2-config.py b/config/linux2-config.py index 536a3e0e327..c0c600f2498 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -155,9 +155,9 @@ WITH_BF_COLLADA = True 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'