diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-01-30 21:20:56 +0300 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-01-30 21:20:56 +0300 |
commit | 0c899f7ded58ef25e29bb60d393b101c40a6ccc5 (patch) | |
tree | f84247a4cbdeed0f5177e2f0aeb1601d47335b67 /config | |
parent | d6611d9844d7235b64b81838fcd280f25ce27a2e (diff) | |
parent | 8597925736b32f3151e22fc993ac212dc8208b8e (diff) |
Merge -c 26209,26214,26443 from COLLADA branch into trunk.
Diffstat (limited to 'config')
-rw-r--r-- | config/linux2-config.py | 2 | ||||
-rw-r--r-- | config/win32-vc-config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index abe79ba5806..4314199f386 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -156,7 +156,7 @@ BF_COLLADA = '#source/blender/collada' BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' BF_OPENCOLLADA = '/usr' -BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre Buffer ftoa' +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' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index f18ed3e2007..4799f91647c 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -145,7 +145,7 @@ 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 xml2 pcre' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre buffer ftoa' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' #Ray trace optimization |