[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52978] trunk/blender/build_files/scons/ config/linux-config.py: SCons: added static libs path for OIIO, OCIO and Boost
Sergey Sharybin
sergey.vfx at gmail.com
Thu Dec 13 17:55:58 CET 2012
Revision: 52978
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52978
Author: nazgul
Date: 2012-12-13 16:55:54 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
SCons: added static libs path for OIIO, OCIO and Boost
This should make it easier to write user-config.py
Still not sure how to deal with OSL and LLVM in a nice way, they're currently
using some hacks which didn't support specifying this libraries as static.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/linux-config.py
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2012-12-13 16:21:08 UTC (rev 52977)
+++ trunk/blender/build_files/scons/config/linux-config.py 2012-12-13 16:55:54 UTC (rev 52978)
@@ -206,6 +206,7 @@
BF_OIIO = '/usr'
BF_OIIO_INC = '${BF_OIIO}/include'
BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
WITH_BF_OCIO = True
@@ -216,6 +217,7 @@
BF_OCIO = '/usr'
BF_OCIO_INC = '${BF_OCIO}/include'
BF_OCIO_LIB = 'OpenColorIO yaml-cpp tinyxml'
+BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
WITH_BF_BOOST = True
@@ -226,6 +228,9 @@
BF_BOOST = '/usr'
BF_BOOST_INC = '${BF_BOOST}/include'
BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
+ '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a' + \
+ '${BF_BOOST_LIBPATH}/libboost_thread.a'
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
More information about the Bf-blender-cvs
mailing list