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 <b.mont29@gmail.com>2020-02-10 19:35:17 +0300
committerBastien Montagne <b.mont29@gmail.com>2020-02-10 19:36:06 +0300
commitc6e28f65139d6e7536789d9bf1895e7f7058ac92 (patch)
tree3d9464a8071590393d092c5c812f8cd423c992b9 /build_files
parentc92163b2b07e922b5fd07ec8c7981509940b103e (diff)
Updated install_deps to latest required OSL/LLVM.
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 8e8aeda0893..2f27eab8e3f 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -392,7 +392,7 @@ OIIO_FORCE_BUILD=false
OIIO_FORCE_REBUILD=false
OIIO_SKIP=false
-LLVM_VERSION="6.0.1"
+LLVM_VERSION="9.0.1"
LLVM_VERSION_MIN="6.0"
LLVM_VERSION_FOUND=""
LLVM_FORCE_BUILD=false
@@ -400,7 +400,7 @@ LLVM_FORCE_REBUILD=false
LLVM_SKIP=false
# OSL needs to be compiled for now!
-OSL_VERSION="1.9.9"
+OSL_VERSION="1.10.9"
OSL_VERSION_MIN=$OSL_VERSION
OSL_FORCE_BUILD=false
OSL_FORCE_REBUILD=false
@@ -2081,7 +2081,7 @@ compile_OSL() {
fi
if [ -d $INST/oiio ]; then
- cmake_d="$cmake_d -D OPENIMAGEIOHOME=$INST/oiio"
+ cmake_d="$cmake_d -D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
fi
if [ ! -z $LLVM_VERSION_FOUND ]; then