Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-05-05 22:46:30 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-05-05 22:57:52 +0400
commitf5687323a362847a2f8d101da8512f06e3c1f5f3 (patch)
treeb1647ec0bb0c568fae8333a80b4ff3798f0fc15e /build_files/build_environment
parent9a1c47de444eec6f6f73896aff8712c6847d328f (diff)
Install_deps: explicitely disable OSL/LLVM seems needed...
Diffstat (limited to 'build_files/build_environment')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index b2290a49ea6..4fa7946bb8b 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2943,7 +2943,6 @@ print_info() {
_buildargs="$_buildargs $_1"
fi
- PRINT "$OSL_SKIP"
if [ "$OSL_SKIP" = false ]; then
_1="-D WITH_CYCLES_OSL=ON"
_2="-D WITH_LLVM=ON"
@@ -2964,6 +2963,12 @@ print_info() {
PRINT " $_2"
_buildargs="$_buildargs $_1 $_2"
fi
+ else
+ _1="-D WITH_CYCLES_OSL=OFF"
+ _2="-D WITH_LLVM=OFF"
+ PRINT " $_1"
+ PRINT " $_2"
+ _buildargs="$_buildargs $_1 $_2"
fi
if $WITH_OPENCOLLADA; then