From 04b7f052e14ee6ff09b5cc4c85a76c4c5a1b0383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Barschkis?= Date: Wed, 19 Feb 2020 18:46:51 +0100 Subject: Fluid: Updated Manta updater script Minor adjustments for the build directory location. --- extern/mantaflow/UPDATE.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extern/mantaflow') 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 -- cgit v1.2.3