diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh index 6ba5c5064..3c2d18ac3 100644 --- a/install/linux/linux_appimages.sh +++ b/install/linux/linux_appimages.sh @@ -57,7 +57,7 @@ mv meshlabserver usr/bin mv LICENSE.txt usr/share/doc/meshlab/ mv privacy.txt usr/share/doc/meshlab/ mv readme.txt usr/share/doc/meshlab/ -mv lib/libcommon* usr/lib/ +mv lib/libmeshlab-common* usr/lib/ mv plugins/ usr/lib/meshlab/ mv shaders/ usr/share/meshlab/ diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index 611c259ab..302e33e1f 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -56,7 +56,7 @@ mv meshlabserver usr/bin mv LICENSE.txt usr/share/doc/meshlab/ mv privacy.txt usr/share/doc/meshlab/ mv readme.txt usr/share/doc/meshlab/ -mv lib/libcommon* usr/lib/ +mv lib/libmeshlab-common* usr/lib/ mv plugins/ usr/lib/meshlab/ mv shaders/ usr/share/meshlab/ diff --git a/src/external/external.pro b/src/external/external.pro index 2d4dc69c4..6c33e029f 100644 --- a/src/external/external.pro +++ b/src/external/external.pro @@ -2,10 +2,14 @@ config += debug_and_release TEMPLATE = subdirs +#just jhead needs to be compiled if the config is meshlab_mini SUBDIRS = \ + jhead-3.04/jhead-3.04.pro + +!meshlab_mini { +SUBDIRS += \ levmar-2.3/levmar-2.3.pro \ structuresynth-1.5/structuresynth.pro \ - jhead-3.04/jhead-3.04.pro # openkinect/openkinect.pro include(../find_system_libs.pri) @@ -14,5 +18,8 @@ include(../find_system_libs.pri) !CONFIG(system_muparser) SUBDIRS += muparser_v225/muParser.pro !CONFIG(system_openctm) SUBDIRS += OpenCTM-1.0.3/openctm.pro !CONFIG(system_lib3ds) SUBDIRS += lib3ds-1.3.0/lib3ds.pro +} + + # Can't easily make muparser conditional because of the fact it relies on the _UNICODE define