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>2013-06-15 12:56:04 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2013-06-15 12:56:04 +0400
commit0794c2722df5869074412d1018dd810785229433 (patch)
tree4f6366c54edfabfdc421c0d91fa7335cbeb12c31 /build_files/build_environment
parent6b009ce8879197d7750186c5773e313c069fb0ab (diff)
Add USE_PYTHON=OFF and USE_OCIO=OFF to OIIO compilation (we do not need either of those).
Diffstat (limited to 'build_files/build_environment')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index d59b3f38354..fbd4c2f46d7 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1158,7 +1158,7 @@ clean_OIIO() {
compile_OIIO() {
# To be changed each time we make edits that would modify the compiled result!
- oiio_magic=11
+ oiio_magic=12
_init_oiio
# Clean install if needed!
@@ -1352,6 +1352,7 @@ EOF
# Optional tests and cmd tools
cmake_d="$cmake_d -D USE_QT=OFF"
+ cmake_d="$cmake_d -D USE_PYTHON=OFF"
cmake_d="$cmake_d -D BUILD_TESTING=OFF"
#cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
#cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"
@@ -1373,6 +1374,7 @@ EOF
# if [ -d $INST/ocio ]; then
# cmake_d="$cmake_d -D OCIO_PATH=$INST/ocio"
# fi
+ cmake_d="$cmake_d -D USE_OCIO=OFF"
if file /bin/cp | grep -q '32-bit'; then
cflags="-fPIC -m32 -march=i686"