kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix (unreported) broken OCIO from install_deps.

Browse Source 
Looks like they removed static libs by default in OCIO 2.0, for some
historical reasons `install_deps` was enforcing using only static libs
for this one, now removed it so that Blender buil can use usual so's.
This commit is contained in:
Bastien Montagne 2021-02-27 13:07:11 +01:00
parent 4b16cb1e9a
commit 28f0a4b27e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_files/build_environment/install_deps.sh
View File

@ -1732,7 +1732,7 @@ compile_OCIO() {
fi
# To be changed each time we make edits that would modify the compiled result!
ocio_magic=2
ocio_magic=3
_init_ocio
# Force having own builds for the dependencies.
@ -1802,11 +1802,11 @@ compile_OCIO() {
make -j$THREADS && make install
# Force linking against static libs
rm -f $_inst/lib/*.so*
#rm -f $_inst/lib/*.so*
# Additional depencencies
cp ext/dist/lib/libtinyxml.a $_inst/lib
cp ext/dist/lib/libyaml-cpp.a $_inst/lib
#cp ext/dist/lib/libtinyxml.a $_inst/lib
#cp ext/dist/lib/libyaml-cpp.a $_inst/lib
make clean