[Bf-blender-cvs] [706a0e2] openvdb: OpenVDB: Tweaksfor scons and buildbot

[Sergey Sharybin]

Commit: 706a0e2139f9aac3a93fd1c6c22db6fd95c3e58f
Author: Sergey Sharybin
Date:   Wed Jun 10 16:52:34 2015 +0200
Branches: openvdb
https://developer.blender.org/rB706a0e2139f9aac3a93fd1c6c22db6fd95c3e58f

OpenVDB: Tweaksfor scons and buildbot

===================================================================

M	build_files/buildbot/config/user-config-glibc211-i686.py
M	build_files/buildbot/config/user-config-glibc211-x86_64.py
M	intern/openvdb/SConscript

===================================================================

diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py
index 06c43be..9caeb25 100644
--- a/build_files/buildbot/config/user-config-glibc211-i686.py
+++ b/build_files/buildbot/config/user-config-glibc211-i686.py
@@ -157,12 +157,20 @@ WITH_BF_STATICBOOST = True
 BF_BOOST = '/opt/lib/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
 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_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a ' + \
+    '${BF_BOOST_LIBPATH}/libboost_thread.a'
 if BF_IS_NEW_OSL:
     BF_BOOST_LIB_STATIC += ' ${BF_BOOST_LIBPATH}/libboost_wave.a'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
+# OpenVDB
+WITH_BF_OPENVDB = True
+WITH_BF_STATICOPENVDB = True
+BF_OPENVDB = '/opt/lib/openvdb'
+BF_OPENVDB_INC = '${BF_OPENVDB}/include'
+BF_OPENVDB_LIB_PATH = '${BF_OPENVDB}/lib'
+BF_OPENVDB_LIB_STATIC = '${BF_OPENVDB}/lib/libopenvdb.a ${BF_BOOST_LIBPATH}/libboost_iostreams.a /opt/lib/tbb/lib/libtbb.a'
+
 # Ocean Simulation
 WITH_BF_OCEANSIM = True
 
diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py
index 29f6143..c18c431 100644
--- a/build_files/buildbot/config/user-config-glibc211-x86_64.py
+++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py
@@ -157,12 +157,20 @@ WITH_BF_STATICBOOST = True
 BF_BOOST = '/opt/lib/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
 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_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a ' + \
+    '${BF_BOOST_LIBPATH}/libboost_thread.a'
 if BF_IS_NEW_OSL:
     BF_BOOST_LIB_STATIC += ' ${BF_BOOST_LIBPATH}/libboost_wave.a'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
+# OpenVDB
+WITH_BF_OPENVDB = True
+WITH_BF_STATICOPENVDB = True
+BF_OPENVDB = '/opt/lib/openvdb'
+BF_OPENVDB_INC = '${BF_OPENVDB}/include'
+BF_OPENVDB_LIB_PATH = '${BF_OPENVDB}/lib'
+BF_OPENVDB_LIB_STATIC = '${BF_OPENVDB}/lib/libopenvdb.a ${BF_BOOST_LIBPATH}/libboost_iostreams.a /opt/lib/tbb/lib/libtbb.a'
+
 # Ocean Simulation
 WITH_BF_OCEANSIM = True
 
diff --git a/intern/openvdb/SConscript b/intern/openvdb/SConscript
index 5435dcc..021c6cb 100644
--- a/intern/openvdb/SConscript
+++ b/intern/openvdb/SConscript
@@ -38,7 +38,8 @@ incs = [
     '../../source/blender/blenlib',
     '../../source/blender/makesdna',
     '../../source/blender/makesrna',
-    env['BF_OPENVDB_INC']
+    env['BF_OPENVDB_INC'],
+    env['BF_BOOST_INC']
 ]
 
 incs.append(env['BF_OPENEXR_INC'].split())