diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-02-03 17:56:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-02-03 18:04:18 +0300 |
| commit | f4f4495586c67817d34cddf8c519992c42ac1e50 (patch) | |
| tree | 32bafe6b9d803a8ee2901144a95b21322bbb9451 | |
| parent | 8e9898394544f7abeddb98144d0dad14281eca16 (diff) | |
install_deps: OIIO: tweak to max version, and cleanup compile code.
OSL 1.10.10 does not build with OIIO 2.2.10.
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 14f9502692b..78e23ed75a6 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -439,7 +439,7 @@ _with_built_openexr=false OIIO_VERSION="2.1.15.0" OIIO_VERSION_SHORT="2.1" OIIO_VERSION_MIN="2.1.12" -OIIO_VERSION_MAX="3.0" +OIIO_VERSION_MAX="2.2.10" OIIO_FORCE_BUILD=false OIIO_FORCE_REBUILD=false OIIO_SKIP=false @@ -2064,7 +2064,6 @@ compile_OIIO() { cmake_d="$cmake_d -D CMAKE_PREFIX_PATH=$_inst" cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst" cmake_d="$cmake_d -D STOP_ON_WARNING=OFF" - cmake_d="$cmake_d -D BUILDSTATIC=OFF" cmake_d="$cmake_d -D LINKSTATIC=OFF" cmake_d="$cmake_d -D USE_SIMD=sse2" @@ -2099,9 +2098,6 @@ compile_OIIO() { # if [ -d $INST/ocio ]; then # cmake_d="$cmake_d -D OCIO_PATH=$INST/ocio" # fi - cmake_d="$cmake_d -D USE_OCIO=OFF" - - cmake_d="$cmake_d -D OIIO_BUILD_CPP11=ON" if file /bin/cp | grep -q '32-bit'; then cflags="-fPIC -m32 -march=i686" |