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:
Diffstat (limited to 'build_files/build_environment/install_deps.sh')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 3852b4fe705..db2a1246a60 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1599,7 +1599,7 @@ compile_OIIO() {
fi
# To be changed each time we make edits that would modify the compiled result!
- oiio_magic=16
+ oiio_magic=17
_init_oiio
# Clean install if needed!
@@ -1663,6 +1663,9 @@ compile_OIIO() {
INFO "ILMBASE_HOME=$INST/openexr"
fi
+ # ptex is only needed when nicholas bishop is ready
+ cmake_d="$cmake_d -D USE_PTEX=OFF"
+
# Optional tests and cmd tools
cmake_d="$cmake_d -D USE_QT=OFF"
cmake_d="$cmake_d -D USE_PYTHON=OFF"
@@ -1774,7 +1777,7 @@ compile_LLVM() {
cd $_src
# XXX Ugly patching hack!
- patch -p1 -i "$SCRIPT_DIR/install_deps_patches/llvm.patch"
+ patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.patch"
cd $CWD
@@ -1880,7 +1883,7 @@ compile_OSL() {
git reset --hard
# XXX Ugly patching hack!
- patch -p1 -i "$SCRIPT_DIR/install_deps_patches/osl.patch"
+ patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.patch"
fi
# Always refresh the whole build!