Fix T40025: install_deps.sh generating wrong make flag for OSL
Most cases should be handled OK now (not all though, would make script way too much tricky - bash is a hell of a messy language :/).
This commit is contained in:
@@ -2943,6 +2943,8 @@ print_info() {
|
||||
_buildargs="$_buildargs $_1"
|
||||
fi
|
||||
|
||||
PRINT "$OSL_SKIP"
|
||||
if [ "$OSL_SKIP" = false ]; then
|
||||
_1="-D WITH_CYCLES_OSL=ON"
|
||||
_2="-D WITH_LLVM=ON"
|
||||
_3="-D LLVM_VERSION=$LLVM_VERSION_FOUND"
|
||||
@@ -2962,6 +2964,7 @@ print_info() {
|
||||
PRINT " $_2"
|
||||
_buildargs="$_buildargs $_1 $_2"
|
||||
fi
|
||||
fi
|
||||
|
||||
if $WITH_OPENCOLLADA; then
|
||||
_1="-D WITH_OPENCOLLADA=ON"
|
||||
@@ -2969,6 +2972,7 @@ print_info() {
|
||||
_buildargs="$_buildargs $_1"
|
||||
fi
|
||||
|
||||
if [ "$FFMPEG_SKIP" = false ]; then
|
||||
_1="-D WITH_CODEC_FFMPEG=ON"
|
||||
_2="-D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'"
|
||||
PRINT " $_1"
|
||||
@@ -2979,6 +2983,7 @@ print_info() {
|
||||
PRINT " $_1"
|
||||
_buildargs="$_buildargs $_1"
|
||||
fi
|
||||
fi
|
||||
|
||||
PRINT ""
|
||||
PRINT "Or even simpler, just run (in your blender-source dir):"
|
||||
@@ -2992,10 +2997,12 @@ print_info() {
|
||||
PRINT "BF_PYTHON_ABI_FLAGS = 'm'"
|
||||
fi
|
||||
|
||||
if [ "$OCIO_SKIP" = false ]; then
|
||||
PRINT "WITH_BF_OCIO = True"
|
||||
if [ -d $INST/ocio ]; then
|
||||
PRINT "BF_OCIO = '$INST/ocio'"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d $INST/openexr ]; then
|
||||
PRINT "BF_OPENEXR = '$INST/openexr'"
|
||||
@@ -3012,10 +3019,12 @@ print_info() {
|
||||
PRINT "WITH_BF_STATICOPENEXR = True"
|
||||
fi
|
||||
|
||||
if [ "$OIIO_SKIP" = false ]; then
|
||||
PRINT "WITH_BF_OIIO = True"
|
||||
if [ -d $INST/oiio ]; then
|
||||
PRINT "BF_OIIO = '$INST/oiio'"
|
||||
fi
|
||||
fi
|
||||
|
||||
PRINT "WITH_BF_CYCLES = True"
|
||||
|
||||
@@ -3023,10 +3032,12 @@ print_info() {
|
||||
PRINT "BF_OSL = '$INST/osl'"
|
||||
fi
|
||||
|
||||
if [ "$BOOST_SKIP" = false ]; then
|
||||
PRINT "WITH_BF_BOOST = True"
|
||||
if [ -d $INST/boost ]; then
|
||||
PRINT "BF_BOOST = '$INST/boost'"
|
||||
fi
|
||||
fi
|
||||
|
||||
if $WITH_OPENCOLLADA; then
|
||||
PRINT "WITH_BF_COLLADA = True"
|
||||
@@ -3035,13 +3046,15 @@ print_info() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$FFMPEG_SKIP" = false ]; then
|
||||
_ffmpeg_list_sep=" "
|
||||
if [ -d $INST/ffmpeg ]; then
|
||||
PRINT "BF_FFMPEG = '$INST/ffmpeg'"
|
||||
fi
|
||||
PRINT "BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice `print_info_ffmpeglink`'"
|
||||
fi
|
||||
|
||||
if ! $WITH_ALL; then
|
||||
if [ "$WITH_ALL" = false ]; then
|
||||
PRINT "WITH_BF_3DMOUSE = False"
|
||||
# No libspacenav in official arch repos...
|
||||
elif [ "$DISTRO" = "ARCH" ]; then
|
||||
|
Reference in New Issue
Block a user