diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-09 16:44:28 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-09 16:44:28 +0300 |
| commit | c1a2f973daafa403664353526b8cf3c59cccf24c (patch) | |
| tree | ca37df851280c88ba533ada38085c875ee049099 /build_files | |
| parent | d533b70b234d6a6cb7a44a556fcbf3fc68f67085 (diff) | |
| parent | 7e39d151d850590fbabc9870bc5134d9421c5c2c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/openal.cmake | 1 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/openimageio.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake index d63c4443ca0..3331361bfbc 100644 --- a/build_files/build_environment/cmake/openal.cmake +++ b/build_files/build_environment/cmake/openal.cmake @@ -25,6 +25,7 @@ if(BUILD_MODE STREQUAL Release) -DALSOFT_CONFIG=Off -DALSOFT_HRTF_DEFS=Off -DALSOFT_INSTALL=On + -DALSOFT_BACKEND_SNDIO=Off ) if(UNIX) diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index 07f6b3cdbef..fdc71508e47 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -90,6 +90,7 @@ set(OPENIMAGEIO_EXTRA_ARGS -DUSE_PYTHON=OFF -DUSE_PYTHON3=OFF -DUSE_OCIO=OFF + -DUSE_WEBP=${WITH_WEBP} -DOIIO_BUILD_TOOLS=${OIIO_TOOLS} -DOIIO_BUILD_TESTS=OFF -DBUILD_TESTING=OFF |