[Bf-blender-cvs] [04b7f052e14] master: Fluid: Updated Manta updater script
Sebastián Barschkis
noreply at git.blender.org
Wed Feb 19 18:59:01 CET 2020
Commit: 04b7f052e14ee6ff09b5cc4c85a76c4c5a1b0383
Author: Sebastián Barschkis
Date: Wed Feb 19 18:46:51 2020 +0100
Branches: master
https://developer.blender.org/rB04b7f052e14ee6ff09b5cc4c85a76c4c5a1b0383
Fluid: Updated Manta updater script
Minor adjustments for the build directory location.
===================================================================
M extern/mantaflow/UPDATE.sh
===================================================================
diff --git a/extern/mantaflow/UPDATE.sh b/extern/mantaflow/UPDATE.sh
index 28d96cdf6d8..0db18d03094 100644
--- a/extern/mantaflow/UPDATE.sh
+++ b/extern/mantaflow/UPDATE.sh
@@ -47,17 +47,17 @@ if [[ "$CLEAN_REPOSITORY" -eq "1" ]]; then
git checkout develop
fi
-MANTA_BUILD_PATH=$MANTA_INSTALLATION/mantaflowgit/build_blender/
+MANTA_BUILD_PATH=$MANTA_INSTALLATION/build_blender/
mkdir -p $MANTA_BUILD_PATH
cd $MANTA_BUILD_PATH
-cmake .. -DGUI=OFF -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=ON -DPREPDEBUG=ON && make -j8
+cmake ../mantaflowgit -DGUI=OFF -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=ON -DPREPDEBUG=ON && make -j8
# ==================== 3) COPY MANTAFLOW FILES TO BLENDER ROOT ===========================
mkdir -p $BLENDER_INSTALLATION/blender/tmp/dependencies/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/dependencies/cnpy "$_"
mkdir -p $BLENDER_INSTALLATION/blender/tmp/helper/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/source/util "$_"
mkdir -p $BLENDER_INSTALLATION/blender/tmp/helper/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/source/pwrapper "$_"
-mkdir -p $BLENDER_INSTALLATION/blender/tmp/preprocessed/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/build_blender/pp/source/. "$_"
+mkdir -p $BLENDER_INSTALLATION/blender/tmp/preprocessed/ && cp -Rf $MANTA_INSTALLATION/build_blender/pp/source/. "$_"
# Remove some files that are not need in Blender
rm $BLENDER_INSTALLATION/blender/tmp/dependencies/cnpy/example1.cpp
More information about the Bf-blender-cvs
mailing list