diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-11 12:14:13 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-11 12:14:13 +0300 |
| commit | f5767241c3c82f1de7add29da790518e0c48cde0 (patch) | |
| tree | 09747fb1d294a90119f7f6c040fa20a67456885f /build_files | |
| parent | 8731bf75bc9136cc501ce72e510283f4b3c96661 (diff) | |
Disable OpenVDB on buildbots for OSX and Windows, until libraries for
these environments are available.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 3 | ||||
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 3 | ||||
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 3 | ||||
| -rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 3 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index f3d5cea51a1..b90b65e9aa2 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 06ce2d6a244..e1f51dcfe91 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 795be4f58d7..8a358dd0429 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 f2f1774a474..a8ee588e39f 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 629ed80afca..7a3ecc078b7 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' |