diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
commit | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (patch) | |
tree | 5b00bbd7dd2f8d08affce8ad7d5688f5b786cde4 /config/linux2-config.py | |
parent | edf32a6fb0213bf35748890dfbc84b20d384298e (diff) |
Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
Diffstat (limited to 'config/linux2-config.py')
-rw-r--r-- | config/linux2-config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index 3eccb913932..3e40b7af416 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -155,9 +155,9 @@ WITH_BF_COLLADA = False 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' |