Merge branch 'main' into devel

# Conflicts: # src/meshlab
cnr-isti-vclab · Sep 19, 2024 · 7d5ca62 · 7d5ca62
2 parents edcc819 + 803f3a4
commit 7d5ca62
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/PYML_VERSION b/PYML_VERSION
@@ -1 +1 @@
-2023.12.post1
+2023.12.post2
diff --git a/scripts/Linux/2_deploy.sh b/scripts/Linux/2_deploy.sh
@@ -8,7 +8,8 @@
 # You can give as argument the path where you installed PyMeshLab.
 
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
-LINUXDEPLOY_PATH=$SCRIPTS_PATH/../../src/meshlab/resources/linux
+ARCH=$(uname -m)
+LINUXDEPLOY_PATH=$SCRIPTS_PATH/../../src/meshlab/resources/linux/$ARCH
 QT_DIR=""
 INSTALL_PATH=$SCRIPTS_PATH/../../pymeshlab
 

diff --git a/src/meshlab b/src/meshlab