diff -up meshlab-2016.12/src/common/common.pro.sharedlib meshlab-2016.12/src/common/common.pro
--- meshlab-2016.12/src/common/common.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/common/common.pro	2017-07-21 16:13:24.869021213 -0400
@@ -1,8 +1,6 @@
 include (../general.pri)
 EXIF_DIR = ../external/jhead-2.95
 
-GLEWCODE = $$GLEWDIR/src/glew.c
-
 win32-msvc2005:DESTDIR = ../distrib
 win32-msvc2008:DESTDIR = ../distrib
 win32-msvc2010:DESTDIR = ../distrib
@@ -54,8 +52,7 @@ echo "linked shader dir"; \
 fi;\
 "
 INCLUDEPATH *= ../.. \
-    $$VCGDIR \
-    $$GLEWDIR/include
+    $$VCGDIR
 TEMPLATE = lib
 linux-g++:CONFIG += dll
 linux-g++:DESTDIR = ../distrib
@@ -80,7 +77,6 @@ QT += script
 TARGET = common
 DEPENDPATH += .
 INCLUDEPATH += . $$EXIF_DIR
-DEFINES += GLEW_STATIC
 win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
 win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
 win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
@@ -117,7 +113,6 @@ SOURCES += 	filterparameter.cpp \
 			mlapplication.cpp \
 			scriptsyntax.cpp \
 			searcher.cpp \
-			$$GLEWCODE \
 			meshlabdocumentxml.cpp \
 			meshlabdocumentbundler.cpp \
 			ml_shared_data_context.cpp 
diff -up meshlab-2016.12/src/external/external.pro.sharedlib meshlab-2016.12/src/external/external.pro
--- meshlab-2016.12/src/external/external.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/external/external.pro	2017-07-21 16:13:24.869021213 -0400
@@ -2,11 +2,5 @@ config += debug_and_release
 
 TEMPLATE      = subdirs
 
-SUBDIRS	= 	bzip2-1.0.5/bzip2-1.0.5.pro \
-			muparser_v225/src \
-			levmar-2.3/levmar-2.3.pro \
-			structuresynth-1.5/structuresynth.pro \
-			OpenCTM-1.0.3/openctm.pro \
-			jhead-2.95/jhead-2.95.pro \
-			lib3ds-1.3.0/lib3ds/lib3ds.pro 
-#			openkinect/openkinect.pro
+SUBDIRS	= 	structuresynth-1.5/structuresynth.pro \
+			jhead-2.95/jhead-2.95.pro
diff -up meshlab-2016.12/src/meshlab/meshlab.pro.sharedlib meshlab-2016.12/src/meshlab/meshlab.pro
--- meshlab-2016.12/src/meshlab/meshlab.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlab/meshlab.pro	2017-07-21 16:13:24.869021213 -0400
@@ -150,7 +150,7 @@ win32-g++:LIBS        	+= -L../external/
 #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
 #}
 
-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
 linux-g++:QMAKE_RPATHDIR += ../distrib
 linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
 linux-g++-32:QMAKE_RPATHDIR += ../distrib
diff -up meshlab-2016.12/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib meshlab-2016.12/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
--- meshlab-2016.12/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/edit_arc3D/edit_arc3D.pro	2017-07-21 16:13:24.869021213 -0400
@@ -35,9 +35,7 @@ win32-msvc2012:LIBS	   += ../../external
 win32-msvc2013:LIBS	   += ../../external/lib/win32-msvc2013/bz2.lib
 win32-msvc2015:LIBS	   += ../../external/lib/win32-msvc2015/bz2.lib
 win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
-linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a
-linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a
-linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a
+linux-g++:LIBS += -lbz2
 mac:LIBS   += -lbz2
 
 win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
@@ -48,9 +46,6 @@ win32-msvc2013:INCLUDEPATH += ../../exte
 win32-msvc2015:INCLUDEPATH += ../../external/bzip2-1.0.5
 
 win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5
-linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
-linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
-linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
 
 
 CONFIG(release, debug|release) {
diff -up meshlab-2016.12/src/meshlabplugins/filter_csg/filter_csg.pro.sharedlib meshlab-2016.12/src/meshlabplugins/filter_csg/filter_csg.pro
--- meshlab-2016.12/src/meshlabplugins/filter_csg/filter_csg.pro.sharedlib	2017-07-21 16:13:59.220145857 -0400
+++ meshlab-2016.12/src/meshlabplugins/filter_csg/filter_csg.pro	2017-07-21 16:14:39.933108385 -0400
@@ -20,7 +20,4 @@ win32-msvc2008:LIBS		 += ../../external/
 win32-msvc2010:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
 win32-msvc2012:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
 win32-msvc2015:LIBS		 += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib
-linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
-linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a
-linux-g++-64:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmpirxx.a ../../external/lib/linux-g++-64/libmpir.a
+linux-g++:LIBS += -lmpirxx -lmpir
diff -up meshlab-2016.12/src/meshlabplugins/filter_func/filter_func.pro.sharedlib meshlab-2016.12/src/meshlabplugins/filter_func/filter_func.pro
--- meshlab-2016.12/src/meshlabplugins/filter_func/filter_func.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_func/filter_func.pro	2017-07-21 16:13:24.869021213 -0400
@@ -19,7 +19,5 @@ win32-msvc2013:LIBS += ../../external/li
 win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib
 
 macx:LIBS            += $$MACLIBDIR/libmuparser.a
-linux-g++:LIBS       += ../../external/lib/linux-g++/libmuparser.a
-linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a
-linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a
+linux-g++:LIBS       += -lmuparser
 win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a
diff -up meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
--- meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2017-07-21 16:13:24.870021187 -0400
@@ -23,8 +23,7 @@ HEADERS       += ./diamond_sampler.h \
 SOURCES       += ./filter_isoparametrization.cpp
 
 TARGET        = filter_isoparametrization
-INCLUDEPATH  += ./  \
-                ../../external/levmar-2.3/
+INCLUDEPATH  += ./
 
 win32-msvc2005:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP
 win32-msvc2008:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP
@@ -51,9 +50,7 @@ win32-msvc2010:LIBS	+= ../../external/li
 win32-msvc2012:LIBS	+= ../../external/lib/win32-msvc2012/levmar.lib
 win32-msvc2015:LIBS	+= ../../external/lib/win32-msvc2015/levmar.lib
 win32-g++:LIBS		+= -L../../external/lib/win32-gcc -llevmar
-linux-g++:LIBS		+= -L../../external/lib/linux-g++ -llevmar
-linux-g++-32:LIBS		+= -L../../external/lib/linux-g++-32 -llevmar
-linux-g++-64:LIBS		+= -L../../external/lib/linux-g++-64 -llevmar
+linux-g++:LIBS		+= -llevmar
 macx:LIBS += $$MACLIBDIR/liblevmar.a
 
 # Please never ever uncomment this...
diff -up meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/param_collapse.h
--- meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/param_collapse.h	2017-07-21 16:13:24.870021187 -0400
@@ -14,7 +14,7 @@
 
 #include <local_parametrization.h>
 #include <mesh_operators.h>
-#include <lm.h>
+#include <levmar.h>
 #include <uv_grid.h>
 
 #include "opt_patch.h"
diff -up meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/parametrizator.h
--- meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_isoparametrization/parametrizator.h	2017-07-21 16:13:24.870021187 -0400
@@ -32,7 +32,7 @@
 #include <vcg/space/color4.h>
 #include <dual_coord_optimization.h>
 #include <float.h>
-#include <lm.h>
+#include <levmar.h>
 #ifndef _MESHLAB
 #include <wrap/io_trimesh/export_ply.h>
 #endif
diff -up meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
--- meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h	2017-07-21 16:13:24.870021187 -0400
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 
 struct LevmarCorrelation {
diff -up meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/solver.h
--- meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/solver.h	2017-07-21 16:13:24.870021187 -0400
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 #include <iostream>
 #include <fstream>
diff -up meshlab-2016.12/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-2016.12/src/meshlabplugins/filter_photosynth/filter_photosynth.pro
--- meshlab-2016.12/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_photosynth/filter_photosynth.pro	2017-07-21 16:13:24.871021161 -0400
@@ -1,17 +1,14 @@
 include (../../shared.pri)
 
-QTSOAPDIR = ../../external/qtsoap-2.7_1/src
-
-INCLUDEPATH += $$QTSOAPDIR
-
 HEADERS       += filter_photosynth.h \
-                 synthData.h \
-                 $$QTSOAPDIR/qtsoap.h
+                 synthData.h
 
 SOURCES       += filter_photosynth.cpp \
-                 downloader.cpp \
-                 $$QTSOAPDIR/qtsoap.cpp
+                 downloader.cpp
 
 TARGET         = filter_photosynth
 
+linux-g++:INCLUDEPATH += /usr/include/qt5/QtSoap
+linux-g++:LIBS += -lqtsoap5
+
 QT += network
diff -up meshlab-2016.12/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib meshlab-2016.12/src/meshlabplugins/filter_qhull/filter_qhull.pro
--- meshlab-2016.12/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_qhull/filter_qhull.pro	2017-07-21 16:13:24.871021161 -0400
@@ -6,28 +6,8 @@ HEADERS       += filter_qhull.h \
 SOURCES       += filter_qhull.cpp \ 
 		qhull_tools.cpp 
 
-HEADERS += 	../../external/qhull-2003.1/src/geom.h \
-		../../external/qhull-2003.1/src/io.h \
-		../../external/qhull-2003.1/src/mem.h \
-		../../external/qhull-2003.1/src/merge.h \
-		../../external/qhull-2003.1/src/poly.h \
-		../../external/qhull-2003.1/src/qhull.h \
-		../../external/qhull-2003.1/src/qset.h \
-		../../external/qhull-2003.1/src/stat.h \
-		../../external/qhull-2003.1/src/user.h 
+INCLUDEPATH += /usr/include/qhull
 
-SOURCES +=	../../external/qhull-2003.1/src/geom.c \
-		../../external/qhull-2003.1/src/geom2.c \
-		../../external/qhull-2003.1/src/global.c \
-		../../external/qhull-2003.1/src/io.c \
-		../../external/qhull-2003.1/src/mem.c \
-		../../external/qhull-2003.1/src/merge.c \
-		../../external/qhull-2003.1/src/poly.c \
-		../../external/qhull-2003.1/src/poly2.c \
-		../../external/qhull-2003.1/src/qconvex.c \
-		../../external/qhull-2003.1/src/qhull.c \
-		../../external/qhull-2003.1/src/qset.c \
-		../../external/qhull-2003.1/src/stat.c \
-		../../external/qhull-2003.1/src/user.c 
+LIBS += -lqhull
 
-TARGET        = filter_qhull
\ No newline at end of file
+TARGET        = filter_qhull
diff -up meshlab-2016.12/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib meshlab-2016.12/src/meshlabplugins/filter_qhull/qhull_tools.h
--- meshlab-2016.12/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/filter_qhull/qhull_tools.h	2017-07-21 16:13:24.871021161 -0400
@@ -55,14 +55,14 @@ extern "C"
 #endif
 #include <stdio.h>
 #include <stdlib.h>
-#include "../../external/qhull-2003.1/src/qhull.h"
-#include "../../external/qhull-2003.1/src/mem.h"
-#include "../../external/qhull-2003.1/src/qset.h"
-#include "../../external/qhull-2003.1/src/geom.h"
-#include "../../external/qhull-2003.1/src/merge.h"
-#include "../../external/qhull-2003.1/src/poly.h"
-#include "../../external/qhull-2003.1/src/io.h"
-#include "../../external/qhull-2003.1/src/stat.h"
+#include <qhull/qhull.h>
+#include <qhull/mem.h>
+#include <qhull/qset.h>
+#include <qhull/geom.h>
+#include <qhull/merge.h>
+#include <qhull/poly.h>
+#include <qhull/io.h>
+#include <qhull/stat.h>
 #if defined(__cplusplus)
 }
 #endif
diff -up meshlab-2016.12/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-2016.12/src/meshlabplugins/io_3ds/io_3ds.pro
--- meshlab-2016.12/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabplugins/io_3ds/io_3ds.pro	2017-07-21 16:13:24.871021161 -0400
@@ -14,7 +14,7 @@ DEFINES += LIB3DS_STATIC
 
 TARGET        = io_3ds
 
-INCLUDEPATH += ../../external/lib3ds-1.3.0/
+INCLUDEPATH += /usr/include/lib3ds/
 
 # Notes on the paths of lib3ds files.
 # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
@@ -26,9 +26,7 @@ win32-msvc.net:LIBS	+= ../../external/li
 win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
 win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
 win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
+linux-g++:LIBS += -l3ds
 
 # unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
 
diff -up meshlab-2016.12/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-2016.12/src/meshlabserver/meshlabserver.pro
--- meshlab-2016.12/src/meshlabserver/meshlabserver.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/meshlabserver/meshlabserver.pro	2017-07-21 16:13:24.871021161 -0400
@@ -1,6 +1,6 @@
 include (../general.pri)
 
-INCLUDEPATH += . .. $$VCGDIR $$GLEWDIR/include
+INCLUDEPATH += . .. $$VCGDIR 
 
 HEADERS        = 
 
@@ -29,12 +29,8 @@ win32-msvc2010:  LIBS += -L../distrib -l
 win32-msvc2012:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
 win32-msvc2015:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
 win32-g++:  LIBS += -L../distrib -lcommon      
-linux-g++:  LIBS += -L../distrib -lcommon
+linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
 linux-g++:QMAKE_RPATHDIR += ../distrib
-linux-g++-32:  LIBS += -L../distrib -lcommon
-linux-g++-32:QMAKE_RPATHDIR += ../distrib
-linux-g++-64:  LIBS += -L../distrib -lcommon
-linux-g++-64:QMAKE_RPATHDIR += ../distrib
 #CONFIG (release,debug | release) {
 #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
 #	win32-msvc2008:release:  LIBS += -L../common/release -lcommon
diff -up meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro.sharedlib meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro
--- meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro	2017-07-21 16:13:24.872021136 -0400
@@ -29,8 +29,6 @@ FORMS         = edit_mutualcorrsDialog.u
 win32-msvc2013:  LIBS += ../../external/lib/win32-msvc2013/levmar.lib
 win32-msvc2015:  LIBS += ../../external/lib/win32-msvc2015/levmar.lib
 win32-g++:LIBS += -L../../external -llevmar
-linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar
-linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar
-linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar
+linux-g++:LIBS += -llevmar
 macx:LIBS            += $$MACLIBDIR/liblevmar.a
 
diff -up meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h.sharedlib meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h
--- meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h	2017-07-21 16:13:24.872021136 -0400
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 
 struct LevmarCorrelation {
diff -up meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/solver.h.sharedlib meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/solver.h
--- meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/solver.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_experimental/edit_mutualcorrs/solver.h	2017-07-21 16:13:24.872021136 -0400
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 #include <iostream>
 #include <fstream>
diff -up meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/levmarmethods.h
--- meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/levmarmethods.h	2017-07-21 16:13:24.872021136 -0400
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 
 struct LevmarCorrelation {
diff -up meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/solver.h
--- meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_experimental/filter_mutualglobal/solver.h	2017-07-21 16:13:24.872021136 -0400
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 #include <iostream>
 #include <fstream>
diff -up meshlab-2016.12/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib meshlab-2016.12/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h
--- meshlab-2016.12/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h	2017-07-21 16:13:24.873021111 -0400
@@ -30,7 +30,7 @@
 #include <vcg/complex/allocate.h>
 #include <vcg/complex/algorithms/subset.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include <lib/levmar/lm.h>
+#include <levmar.h>
 
 #include "frame.h"
 
diff -up meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h
--- meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h	2017-07-21 16:13:24.873021111 -0400
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 
 struct LevmarCorrelation {
diff -up meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/solver.h
--- meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_unsupported/filter_mutualinfo/solver.h	2017-07-21 16:13:24.873021111 -0400
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include <levmar.h>
 
 #include <iostream>
 #include <fstream>
diff -up meshlab-2016.12/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib meshlab-2016.12/src/plugins_unsupported/io_epoch/io_epoch.pro
--- meshlab-2016.12/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib	2016-12-23 05:24:59.000000000 -0500
+++ meshlab-2016.12/src/plugins_unsupported/io_epoch/io_epoch.pro	2017-07-21 16:13:24.873021111 -0400
@@ -30,16 +30,11 @@ QT           += xml
 win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib
 win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
 win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
-linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a
-linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a
-linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a
+linux-g++:LIBS	+= -lbz2
 
 win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
 win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
 win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5
-linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
-linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
-linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
 
 mac:LIBS   += -lbz2