From e47e4314c6c157fedc3a8e235f80b78caa8637c2 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Sat, 13 Jun 2020 10:33:04 +0200 Subject: [PATCH] last try appimage and snap --- install/linux/linux_appimages.sh | 2 -- install/linux/linux_deploy.sh | 2 -- install/linux/resources/snap/snap_noversion.yaml | 2 -- snapcraft.yaml | 2 -- src/meshlab/meshlab.pro | 4 ++++ 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh index 675f228f3..f9b205c1d 100644 --- a/install/linux/linux_appimages.sh +++ b/install/linux/linux_appimages.sh @@ -60,8 +60,6 @@ mv readme.txt usr/share/doc/meshlab/ mv lib/libmeshlab-common* usr/lib/ mv plugins/ usr/lib/meshlab/ mv lib/linux/* usr/lib/meshlab/ -mv usr/lib/meshlab/libIDTF* usr/lib/ -mv usr/lib/meshlab/libIFX* usr/lib/ #chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so mv shaders/ usr/share/meshlab/ diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index fb5f54a10..f99407124 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -57,8 +57,6 @@ mv readme.txt usr/share/doc/meshlab/ mv lib/libmeshlab-common* usr/lib/ mv plugins/ usr/lib/meshlab/ mv lib/linux/* usr/lib/meshlab/ -mv usr/lib/meshlab/libIDTF* usr/lib/ -mv usr/lib/meshlab/libIFX* usr/lib/ #chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so mv shaders/ usr/share/meshlab/ diff --git a/install/linux/resources/snap/snap_noversion.yaml b/install/linux/resources/snap/snap_noversion.yaml index 52cefdf38..be6bf2f39 100644 --- a/install/linux/resources/snap/snap_noversion.yaml +++ b/install/linux/resources/snap/snap_noversion.yaml @@ -109,6 +109,4 @@ parts: mv lib/libmeshlab-common* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ - mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIDTF* $SNAPCRAFT_PART_INSTALL/usr/lib/ - mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ diff --git a/snapcraft.yaml b/snapcraft.yaml index 4a737fa69..25d4c03fd 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -109,6 +109,4 @@ parts: mv lib/libmeshlab-common* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ - mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIDTF* $SNAPCRAFT_PART_INSTALL/usr/lib/ - mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index 6ef89f84a..70607c325 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -134,6 +134,10 @@ linux:LIBS += \ -lmeshlab-common -lGLU \ -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -ljhead +#ldflags for linux deploy (appimage/snap) +linux:QMAKE_LFLAGS += \ + -Wl,-R,'$$ORIGIN/../lib/meshlab' -Wl,--enable-new-dtags + !CONFIG(system_glew) { INCLUDEPATH *= $$GLEWDIR/include }