[Bf-blender-cvs] [f576724] gooseberry: Disable OpenVDB on buildbots for OSX and Windows, until libraries for these environments are available.
Lukas Tönne
noreply at git.blender.org
Thu Jun 11 11:15:26 CEST 2015
Commit: f5767241c3c82f1de7add29da790518e0c48cde0
Author: Lukas Tönne
Date: Thu Jun 11 11:14:13 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBf5767241c3c82f1de7add29da790518e0c48cde0
Disable OpenVDB on buildbots for OSX and Windows, until libraries for
these environments are available.
===================================================================
M build_files/scons/config/darwin-config.py
M build_files/scons/config/win32-mingw-config.py
M build_files/scons/config/win32-vc-config.py
M build_files/scons/config/win64-mingw-config.py
M build_files/scons/config/win64-vc-config.py
===================================================================
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index f3d5cea..b90b65e 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -226,6 +226,9 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = []
# SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
WITH_BF_3DMOUSE = True
+# Disable OpenVDB, until libraries are available
+WITH_BF_OPENVDB = False
+
#############################################################################
################### various compile settings and flags ##################
#############################################################################
diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py
index 06ce2d6..e1f51dc 100644
--- a/build_files/scons/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
@@ -188,6 +188,9 @@ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
#Freestyle
WITH_BF_FREESTYLE = True
+# Disable OpenVDB, until libraries are available
+WITH_BF_OPENVDB = False
+
##
CC = 'gcc'
CXX = 'g++'
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 795be4f..8a358dd 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -214,6 +214,9 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
#Freestyle
WITH_BF_FREESTYLE = True
+# Disable OpenVDB, until libraries are available
+WITH_BF_OPENVDB = False
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py
index f2f1774..a8ee588 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -182,6 +182,9 @@ WITH_BF_OPENMP = True
#Freestyle
WITH_BF_FREESTYLE = True
+# Disable OpenVDB, until libraries are available
+WITH_BF_OPENVDB = False
+
##
CC = 'gcc'
CXX = 'g++'
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 629ed80..7a3ecc0 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -218,6 +218,9 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
#Freestyle
WITH_BF_FREESTYLE = True
+# Disable OpenVDB, until libraries are available
+WITH_BF_OPENVDB = False
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
More information about the Bf-blender-cvs
mailing list