Automatic merge branch 'main' into 'devel'

cnr-isti-vclab · Sep 19, 2024 · a3b311a · a3b311a
2 parents b1a816c + 8fd4c52
commit a3b311a
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 2 deletions.
diff --git a/resources/linux/aarch64/linuxdeploy b/resources/linux/aarch64/linuxdeploy
diff --git a/resources/linux/aarch64/linuxdeploy-plugin-qt b/resources/linux/aarch64/linuxdeploy-plugin-qt
diff --git a/resources/linux/linuxdeploy → resources/linux/x86_64/linuxdeploy b/resources/linux/linuxdeploy → resources/linux/x86_64/linuxdeploy
diff --git a/resources/linux/linuxdeploy-plugin-appimage → .../linux/x86_64/linuxdeploy-plugin-appimage b/resources/linux/linuxdeploy-plugin-appimage → .../linux/x86_64/linuxdeploy-plugin-appimage
diff --git a/resources/linux/linuxdeploy-plugin-qt → resources/linux/x86_64/linuxdeploy-plugin-qt b/resources/linux/linuxdeploy-plugin-qt → resources/linux/x86_64/linuxdeploy-plugin-qt
diff --git a/scripts/Linux/internal/2c_portable.sh b/scripts/Linux/internal/2c_portable.sh
@@ -32,7 +32,7 @@ then
 fi
 
 # Make sure that deploy succeeds before we start deleting files
-if $RESOURCES_PATH/linux/linuxdeploy --appdir=$INSTALL_PATH --plugin qt; then
+if $RESOURCES_PATH/linux/x86_64/linuxdeploy --appdir=$INSTALL_PATH --plugin qt; then
   # after deploy, all required libraries are placed into usr/lib, therefore we can remove the ones in
   # usr/lib/meshlab (except for the ones that are loaded at runtime)
   cd $INSTALL_PATH/usr/lib/meshlab

diff --git a/scripts/Linux/internal/2d_appimage.sh b/scripts/Linux/internal/2d_appimage.sh
@@ -23,7 +23,7 @@ case $i in
 esac
 done
 
-$RESOURCES_PATH/linux/linuxdeploy --appdir=$INSTALL_PATH \
+$RESOURCES_PATH/linux/x86_64/linuxdeploy --appdir=$INSTALL_PATH \
   --output appimage
 
 #get version