Drop upstream applied patches, quick fix for externals.

7 files changed, 482 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cefa60914b6c..a6789993ab52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = meshlab-git
 	pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)
-	pkgver = 2019.01.29.f6c6675.r2.g17d380b1
+	pkgver = 2019.12.06.f8778c4.r0.gf8778c44
 	pkgrel = 1
 	url = https://www.meshlab.net
 	install = meshlab-git.install
@@ -29,6 +29,7 @@ pkgbase = meshlab-git
 	conflicts = meshlab
 	source = git+https://github.com/cnr-isti-vclab/meshlab.git
 	source = git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel
+	source = revert-external.patch
 	source = plugin_dir.patch
 	source = shaders_dir.patch
 	source = external.patch
@@ -43,12 +44,13 @@ pkgbase = meshlab-git
 	source = meshlab.desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = aeef11fabc93d3dc1b804a400081f35b428ed5cbe270282298dd84b831eb5b96
 	sha256sums = 0072605f6547f92f0d0c3abd18ec904d325185a5b6feac500ec0cb34e38b72b4
 	sha256sums = 736c7afac25bc7b23703082c4d79a9981782038d23e39b646adfeae345d44374
-	sha256sums = 4897153f5edc8e36961d4251d8ea0b4cf3514ebf1258f6ffd7a933f02d594162
-	sha256sums = a2b539e42a2468b95ecf5d08c269f3bbc5d9672840e3743e5facbd7a90b9564c
-	sha256sums = b2ae4862d98723c20be2312da2e5e73f3d59e9cc202f677b51e89270671bdf42
-	sha256sums = 8b14d074da7d037814ffc901b3c03e9a2fa91f1b44ec0d83b7aeef4f380aa185
+	sha256sums = 21e9f2fc1c971fbd00cb9d40e773c07ba24de0482197fd1b4ca42908f2097fc9
+	sha256sums = 86d6c8c5133fc0823a11289ab9e19c850e4564535c2026787e2da00d7d2b184b
+	sha256sums = e37a51fe244764b644764387a1d24dcd7262b6aee12386e1d9baa771bf4f8287
+	sha256sums = 7c048e5b70bb7be3530392dab606713b04878304ce0a6cde6156b9a84b3261f5
 	sha256sums = 48229a56e8b61b8a0c21062e1cfe0ae2417f7609aa1a2ad29debdd636cadae3d
 	sha256sums = 5a041c414777036ebd8925108a9bb51f66ab435324ff4671012bdcb806fcf400
 	sha256sums = 865b318f4196b1a34b17867dc18e116ef5f702b4905bb2d536609eb79af1c1bc
diff --git a/3ds.patch b/3ds.patch
index 00e187696c5a..5f19402c7432 100644
--- a/3ds.patch
+++ b/3ds.patch
@@ -11,19 +11,3 @@ index 85b4a744..74ba5c6e 100644
  
  # Notes on the paths of lib3ds files.
  # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
-@@ -26,11 +26,11 @@ win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
- 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 += $$PWD/../../external/lib/linux-g++/lib3ds.a
--linux-g++-32:LIBS += $$PWD/../../external/lib/linux-g++-32/lib3ds.a
--linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/lib3ds.a
-+linux-g++:LIBS += -l3ds
-+linux-g++-32:LIBS += -l3ds
-+linux-g++-64:LIBS += -l3ds
- 
--# unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
-+unix:LIBS += -l3ds
- 
- # mac:LIBS -= -l3ds 
- # mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a
diff --git a/PKGBUILD b/PKGBUILD
index a29518711b73..228580c617d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=meshlab-git
-pkgver=2019.01.29.f6c6675.r2.g17d380b1
+pkgver=2019.12.06.f8778c4.r0.gf8778c44
 pkgrel=1
 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)"
 arch=('i686' 'x86_64')
@@ -19,6 +19,7 @@ optdepends=('u3d: for U3D and IDTF file support'
 install="${pkgname}.install"
 source=("git+https://github.com/cnr-isti-vclab/meshlab.git"
         "git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel"
+        "revert-external.patch"
         "plugin_dir.patch"
         "shaders_dir.patch"
         "external.patch"
@@ -33,12 +34,13 @@ source=("git+https://github.com/cnr-isti-vclab/meshlab.git"
         "meshlab.desktop")
 sha256sums=('SKIP'
             'SKIP'
+            'aeef11fabc93d3dc1b804a400081f35b428ed5cbe270282298dd84b831eb5b96'
             '0072605f6547f92f0d0c3abd18ec904d325185a5b6feac500ec0cb34e38b72b4'
             '736c7afac25bc7b23703082c4d79a9981782038d23e39b646adfeae345d44374'
-            '4897153f5edc8e36961d4251d8ea0b4cf3514ebf1258f6ffd7a933f02d594162'
-            'a2b539e42a2468b95ecf5d08c269f3bbc5d9672840e3743e5facbd7a90b9564c'
-            'b2ae4862d98723c20be2312da2e5e73f3d59e9cc202f677b51e89270671bdf42'
-            '8b14d074da7d037814ffc901b3c03e9a2fa91f1b44ec0d83b7aeef4f380aa185'
+            '21e9f2fc1c971fbd00cb9d40e773c07ba24de0482197fd1b4ca42908f2097fc9'
+            '86d6c8c5133fc0823a11289ab9e19c850e4564535c2026787e2da00d7d2b184b'
+            'e37a51fe244764b644764387a1d24dcd7262b6aee12386e1d9baa771bf4f8287'
+            '7c048e5b70bb7be3530392dab606713b04878304ce0a6cde6156b9a84b3261f5'
             '48229a56e8b61b8a0c21062e1cfe0ae2417f7609aa1a2ad29debdd636cadae3d'
             '5a041c414777036ebd8925108a9bb51f66ab435324ff4671012bdcb806fcf400'
             '865b318f4196b1a34b17867dc18e116ef5f702b4905bb2d536609eb79af1c1bc'
@@ -58,28 +60,30 @@ prepare() {
   # remove bundled headers and libraries
   rm -fr meshlab/src/external/{inc,lib}
 
+  msg "revert upstram patch to external lib"
+  patch -Np1 -i ${srcdir}/revert-external.patch
   msg "truncate external lib"
-  patch -Np1 -i ../external.patch
+  patch -Np1 -i ${srcdir}/external.patch
   msg "fix rpath"
-  patch -Np1 -i ../rpath.patch
+  patch -Np1 -i ${srcdir}/rpath.patch
   msg "fix meshalbserver missing -lGLU"
-  patch -Np1 -i ../meshlabserver_GLU.patch
+  patch -Np1 -i ${srcdir}/meshlabserver_GLU.patch
   msg "using system mpir lib"
-  patch -Np1 -i ../mpir.patch
+  patch -Np1 -i ${srcdir}/mpir.patch
   msg "using system muparser lib"
-  patch -Np1 -i ../muparser.patch
+  patch -Np1 -i ${srcdir}/muparser.patch
   msg "using system levmar lib"
-  patch -Np1 -i ../levmar.patch
+  patch -Np1 -i ${srcdir}/levmar.patch
   msg "using system 3ds lib"
-  patch -Np1 -i ../3ds.patch
+  patch -Np1 -i ${srcdir}/3ds.patch
   msg "put plugins in /usr/lib/mashlab"
-  patch -Np1 -i ../plugin_dir.patch
+  patch -Np1 -i ${srcdir}/plugin_dir.patch
   msg "put shaders in /usr/shade/meshlab"
-  patch -Np1 -i ../shaders_dir.patch
+  patch -Np1 -i ${srcdir}/shaders_dir.patch
   msg "qt(5.11) compatibility"
-  patch -Np1 -i ../qt5.11.patch
+  patch -Np1 -i ${srcdir}/qt5.11.patch
   msg "fix muparser unicode string"
-  patch -Np1 -i ../muparser_drop_unicode.patch
+  patch -Np1 -i ${srcdir}/muparser_drop_unicode.patch
   cd ${srcdir}/vcglib
 }
 
diff --git a/external.patch b/external.patch
index 28ea7d3ec546..11ada8742e98 100644
--- a/external.patch
+++ b/external.patch
@@ -16,29 +16,3 @@ index 7bd97f60..93ed196b 100644
 -			lib3ds-1.3.0/lib3ds/lib3ds.pro 
 -#			openkinect/openkinect.pro
 +			jhead-2.95/jhead-2.95.pro
-diff --git a/src/external/ext_common.pri b/src/external/ext_common.pri
-index 878e9cdc..387fe3ce 100644
---- a/src/external/ext_common.pri
-+++ b/src/external/ext_common.pri
-@@ -12,7 +12,7 @@ win32-msvc2015:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2017:DEFINES += _CRT_SECURE_NO_WARNINGS

- win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS

- 

--linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux

-+linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++

- 

- unix:CONFIG(release, debug|release) {

- 	DEFINES *= NDEBUG

-diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
-index cae4cb4f..a3fbcdc3 100644
---- a/src/meshlab/meshlab.pro
-+++ b/src/meshlab/meshlab.pro
-@@ -154,7 +154,7 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
- #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
- #}
- 
--linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU
-+linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
- linux:QMAKE_RPATHDIR += ../distrib
- 
- # uncomment in your local copy only in emergency cases.
diff --git a/levmar.patch b/levmar.patch
index 60c93ab842c1..d75876acb7eb 100644
--- a/levmar.patch
+++ b/levmar.patch
@@ -1,20 +1,3 @@
-diff --git a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
-index 808b0b21..b02cdcff 100644
---- a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
-+++ b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
-@@ -53,9 +53,9 @@ win32-msvc2010:LIBS	+= ../../external/lib/win32-msvc2010/levmar.lib
- 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$$PWD/../../external/lib/linux-g++ -llevmar

--linux-g++-32:LIBS		+= -L$$PWD/../../external/lib/linux-g++-32 -llevmar

--linux-g++-64:LIBS		+= -L$$PWD/../../external/lib/linux-g++-64 -llevmar

-+linux-g++:LIBS		+= -llevmar

-+linux-g++-32:LIBS		+=  -llevmar

-+linux-g++-64:LIBS		+=  -llevmar

- macx:LIBS += $$MACLIBDIR/liblevmar.a

- 

- # Please never ever uncomment this...

 diff --git a/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h b/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
 index 484d6dbf..8c0ae176 100644
 --- a/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
@@ -41,22 +24,6 @@ index c45992b2..4d7b7405 100644
  

  #include <iostream>

  #include <fstream>

-diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
-index ce494321..6eb7596b 100644
---- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
-+++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
-@@ -29,8 +29,8 @@ win32-msvc:  LIBS += ../../external/lib/win32-msvc/levmar.lib
- 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$$PWD/../../external/lib/linux-g++ -llevmar

--linux-g++-32:LIBS += -L$$PWD/../../external/lib/linux-g++-32 -llevmar

--linux-g++-64:LIBS += -L$$PWD/../../external/lib/linux-g++-64 -llevmar

-+linux-g++:LIBS += -llevmar

-+linux-g++-32:LIBS += -llevmar

-+linux-g++-64:LIBS += -llevmar

- macx:LIBS            += $$MACLIBDIR/liblevmar.a

- 

 diff --git a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
 index 484d6dbf..8c0ae176 100644
 --- a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
diff --git a/muparser.patch b/muparser.patch
index 926655b1528e..c9aecf451446 100644
--- a/muparser.patch
+++ b/muparser.patch
@@ -12,14 +12,3 @@ index ef6b654c..7d8d32c8 100644
  # Note: we need static libs so when building muparser lib use 

  # ./configure --enable-shared=no

  

-@@ -22,7 +19,7 @@ win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib

- 

- macx:LIBS            += $$MACLIBDIR/libmuparser.a

--linux-g++:LIBS       += $$PWD/../../external/lib/linux-g++/libmuparser.a

--linux-g++-32:LIBS       += $$PWD/../../external/lib/linux-g++-32/libmuparser.a

--linux-g++-64:LIBS       += $$PWD/../../external/lib/linux-g++-64/libmuparser.a

-+linux-g++:LIBS       += -lmuparser

-+linux-g++-32:LIBS       += -lmuparser

-+linux-g++-64:LIBS       += -lmuparser

- win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a

diff --git a/revert-external.patch b/revert-external.patch
new file mode 100644
index 000000000000..873079b68c4a
--- /dev/null
+++ b/revert-external.patch
@@ -0,0 +1,455 @@
+From 8660a924bb8c990dab6aea3a72a62cae3be7066a Mon Sep 17 00:00:00 2001
+From: bartus <szczepaniak.bartek+github@gmail.com>
+Date: Tue, 10 Dec 2019 00:05:33 +0100
+Subject: [PATCH] Revert "Use some system libraries if desired."
+
+This reverts commit d4564c341d0f2793b93518946676c8a3c6698d2c.
+---
+ src/common/common.pro                               | 13 ++++---------
+ src/external/external.pro                           | 11 ++++-------
+ src/general.pri                                     |  5 ++---
+ src/meshlab/meshlab.pro                             |  8 ++------
+ src/meshlabplugins/edit_align/edit_align.pro        |  9 +++------
+ src/meshlabplugins/filter_plymc/plymc.pro           |  5 ++---
+ src/meshlabplugins/io_3ds/io_3ds.pro                | 11 ++++++-----
+ src/meshlabplugins/io_ctm/io_ctm.pro                |  3 +--
+ .../render_radiance_scaling.pro                     |  7 +------
+ src/meshlabserver/meshlabserver.pro                 |  6 +-----
+ .../edit_ocme/src/ocme/ocme_builder.pro             |  5 ++---
+ .../filter_multiscale_align.pro                     |  5 ++---
+ src/plugins_unsupported/edit_arc3D/edit_arc3D.pro   | 12 +++++++++++-
+ src/plugins_unsupported/edit_fit/edit_fit.pro       |  7 ++-----
+ src/plugins_unsupported/editpaint/editpaint.pro     |  5 +----
+ .../filter_rangemap/filter_rangemap.pro             |  7 ++-----
+ src/plugins_unsupported/io_epoch/io_epoch.pro       |  7 ++++++-
+ src/plugins_unsupported/render_rm/render_rm.pro     |  7 ++-----
+ src/shared.pri                                      |  6 ++----
+ 19 files changed, 56 insertions(+), 83 deletions(-)
+
+diff --git a/src/common/common.pro b/src/common/common.pro
+index 007e7003..cf4cccff 100644
+--- a/src/common/common.pro
++++ b/src/common/common.pro
+@@ -1,6 +1,7 @@
+ include (../general.pri)
+ EXIF_DIR = ../external/jhead-2.95
+ 
++GLEWCODE = $$GLEWDIR/src/glew.c
+ 
+ win32-msvc2005:DESTDIR = ../distrib
+ win32-msvc2008:DESTDIR = ../distrib
+@@ -43,11 +44,8 @@ fi;\
+ INCLUDEPATH *= ../.. \
+     $$VCGDIR \
+     $$EIGENDIR \
++    $$GLEWDIR/include \
+     $$EXIF_DIR
+-!CONFIG(system_glew) {
+-	INCLUDEPATH *= $$GLEWDIR/include
+-	GLEWCODE = $$GLEWDIR/src/glew.c
+-}
+ TEMPLATE = lib
+ 
+ linux:CONFIG += dll
+@@ -71,6 +69,7 @@ QT += script
+ 
+ TARGET = common
+ DEPENDPATH += .
++DEFINES += GLEW_STATIC
+ 
+ win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
+ 
+@@ -103,11 +102,7 @@ SOURCES += 	filterparameter.cpp \
+ 			mlapplication.cpp \
+ 			scriptsyntax.cpp \
+ 			searcher.cpp \
++			$$GLEWCODE \
+ 			meshlabdocumentxml.cpp \
+ 			meshlabdocumentbundler.cpp \
+ 			ml_shared_data_context.cpp 
+-
+-!CONFIG(system_glew) {
+-	SOURCES += $$GLEWCODE
+-	DEFINES += GLEW_STATIC
+-}
+diff --git a/src/external/external.pro b/src/external/external.pro
+index 966e9888..7bd97f60 100644
+--- a/src/external/external.pro
++++ b/src/external/external.pro
+@@ -2,14 +2,11 @@ config += debug_and_release
+ 
+ TEMPLATE      = subdirs
+ 
+-SUBDIRS	= 	muparser_v225/src \
++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
+-
+-!CONFIG(system_bzip2)   SUBDIRS	+= 	bzip2-1.0.5/bzip2-1.0.5.pro
+-!CONFIG(system_openctm) SUBDIRS	+= 	OpenCTM-1.0.3/openctm.pro
+-!CONFIG(system_lib3ds)  SUBDIRS	+= 	lib3ds-1.3.0/lib3ds/lib3ds.pro
+-
+-# Can't easily make muparser conditional because of the fact it relies on the _UNICODE define
+diff --git a/src/general.pri b/src/general.pri
+index 1c4f9aea..36193c5a 100644
+--- a/src/general.pri
++++ b/src/general.pri
+@@ -6,9 +6,8 @@
+ DEFINES += MESHLAB_SCALAR=float
+ 
+ VCGDIR   = ../../../vcglib
+-CONFIG(system_eigen3): EIGENDIR = /usr/include/eigen3
+-!CONFIG(system_eigen3):EIGENDIR = $$VCGDIR/eigenlib
+-!CONFIG(system_glew):  GLEWDIR = ../external/glew-2.1.0
++EIGENDIR = $$VCGDIR/eigenlib
++GLEWDIR = ../external/glew-2.1.0
+ 
+ CONFIG += c++11
+ 
+diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
+index 3e7a99be..5f542b87 100644
+--- a/src/meshlab/meshlab.pro
++++ b/src/meshlab/meshlab.pro
+@@ -10,8 +10,8 @@ INCLUDEPATH *= . \
+ 	../.. \
+     $$VCGDIR \
+     $$EIGENDIR \
++    $$GLEWDIR/include \
+ 	$$EXIF_DIR
+-!CONFIG(system_glew): INCLUDEPATH *= $$GLEWDIR/include
+ DEPENDPATH += $$VCGDIR \
+     $$VCGDIR/vcg \
+     $$VCGDIR/wrap
+@@ -65,6 +65,7 @@ SOURCES = main.cpp \
+ 	$$VCGDIR/wrap/gui/trackball.cpp \
+     $$VCGDIR/wrap/gui/trackmode.cpp \
+ 	$$VCGDIR/wrap/gui/coordinateframe.cpp \
++	#$$GLEWDIR/src/glew.c \
+     glarea_setting.cpp \
+ 	filterthread.cpp 
+ 
+@@ -156,11 +157,6 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
+ linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
+ linux:QMAKE_RPATHDIR += ../distrib
+ 
+-!CONFIG(system_glew) {
+-	INCLUDEPATH *= $$GLEWDIR/include
+-}
+-CONFIG(system_glew): LIBS += -lGLEW
+-
+ # uncomment in your local copy only in emergency cases.
+ # We should never be too permissive
+ # win32-g++:QMAKE_CXXFLAGS += -fpermissive
+diff --git a/src/meshlabplugins/edit_align/edit_align.pro b/src/meshlabplugins/edit_align/edit_align.pro
+index f1009822..2637cf0b 100644
+--- a/src/meshlabplugins/edit_align/edit_align.pro
++++ b/src/meshlabplugins/edit_align/edit_align.pro
+@@ -32,12 +32,9 @@ SOURCES       = edit_align_factory.cpp \
+                 ../../meshlab/stdpardialog.cpp \
+                 $$VCGDIR/wrap/ply/plylib.cpp\
+                 $$VCGDIR/wrap/gui/trackball.cpp\
+-                $$VCGDIR/wrap/gui/trackmode.cpp
+-
+-!CONFIG(system_glew): SOURCES += $$GLEWCODE
+-CONFIG(system_glew) {
+-    linux: LIBS += -lGLEW
+-}
++                $$VCGDIR/wrap/gui/trackmode.cpp \
++                $$GLEWCODE 
++    
+                 
+ INCLUDEPATH += ../../external
+ 
+diff --git a/src/meshlabplugins/filter_plymc/plymc.pro b/src/meshlabplugins/filter_plymc/plymc.pro
+index 282fa9ed..b6094191 100755
+--- a/src/meshlabplugins/filter_plymc/plymc.pro
++++ b/src/meshlabplugins/filter_plymc/plymc.pro
+@@ -1,6 +1,7 @@
+ TARGET = plymc
+ DEPENDPATH += .
+-INCLUDEPATH += ../../../../vcglib
++INCLUDEPATH += ../../../../vcglib \
++    ../../code/lib/glew/include
+ CONFIG += console \
+     stl \
+     debug_and_release
+@@ -23,7 +24,5 @@ HEADERS = plymc.h \
+     simplemeshprovider.h \
+     ../../meshlab/alnParser.h
+ 
+-!CONFIG(system_glew): INCLUDEPATH *= ../../code/lib/glew/include
+-
+ #macx-g++:DEFINES += NDEBUG
+ 
+diff --git a/src/meshlabplugins/io_3ds/io_3ds.pro b/src/meshlabplugins/io_3ds/io_3ds.pro
+index 620d2653..fd1b44f9 100644
+--- a/src/meshlabplugins/io_3ds/io_3ds.pro
++++ b/src/meshlabplugins/io_3ds/io_3ds.pro
+@@ -8,14 +8,13 @@ HEADERS		= meshio.h \
+ 			import_3ds.h \
+ 			io_3ds.h 
+ 				
+-SOURCES       += 	meshio.cpp
++SOURCES       += 	meshio.cpp \
++			
++DEFINES += LIB3DS_STATIC
+ 
+ TARGET        = io_3ds
+ 
+-!CONFIG(system_lib3ds) {
+-	INCLUDEPATH *= ../../external/lib3ds-1.3.0/
+-	DEFINES += LIB3DS_STATIC
+-}
++INCLUDEPATH += ../../external/lib3ds-1.3.0/
+ 
+ # Notes on the paths of lib3ds files.
+ # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
+@@ -29,6 +28,8 @@ win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
+ win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
+ linux-g++:LIBS += -l3ds
+ 
++# unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
++
+ # mac:LIBS -= -l3ds 
+ # mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a
+ 
+diff --git a/src/meshlabplugins/io_ctm/io_ctm.pro b/src/meshlabplugins/io_ctm/io_ctm.pro
+index 5a0586c6..7265e035 100644
+--- a/src/meshlabplugins/io_ctm/io_ctm.pro
++++ b/src/meshlabplugins/io_ctm/io_ctm.pro
+@@ -3,10 +3,9 @@ HEADERS += io_ctm.h \
+     $$VCGDIR/wrap/io_trimesh/import_ctm.h \
+     $$VCGDIR/wrap/io_trimesh/export_ctm.h
+ SOURCES += io_ctm.cpp
++INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
+ TARGET = io_ctm
+ 
+-!CONFIG(system_openctm): INCLUDEPATH *= ../../external/OpenCTM-1.0.3/lib
+-
+ win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+ win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+ win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+diff --git a/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro b/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro
+index bc1b6670..ed7b1fb4 100644
+--- a/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro
++++ b/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro
+@@ -1,12 +1,7 @@
+ include (../../shared.pri)
+ 
+ HEADERS       = textureParams.h textureFormat.h texture2D.h framebufferObject.h gpuShader.h gpuProgram.h radianceScalingRenderer.h shaderDialog.h
+-SOURCES       = textureParams.cpp textureFormat.cpp framebufferObject.cpp gpuShader.cpp gpuProgram.cpp radianceScalingRenderer.cpp shaderDialog.cpp
+-
+-!CONFIG(system_glew): SOURCES += $$GLEWCODE
+-CONFIG(system_glew) {
+-    linux: LIBS += -lGLEW
+-}
++SOURCES       = textureParams.cpp textureFormat.cpp framebufferObject.cpp gpuShader.cpp gpuProgram.cpp radianceScalingRenderer.cpp shaderDialog.cpp $$GLEWCODE
+ 
+ TARGET        = render_radiance_scaling
+ FORMS         = shaderDialog.ui
+diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro
+index 66accaec..e97962a1 100644
+--- a/src/meshlabserver/meshlabserver.pro
++++ b/src/meshlabserver/meshlabserver.pro
+@@ -1,8 +1,6 @@
+ include (../general.pri)
+ 
+-INCLUDEPATH += . .. $$VCGDIR $$EIGENDIR
+-
+-!CONFIG(system_glew): INCLUDEPATH *= $$GLEWDIR/include
++INCLUDEPATH += . .. $$VCGDIR $$EIGENDIR $$GLEWDIR/include
+ 
+ HEADERS        = 
+ 
+@@ -46,8 +44,6 @@ win32-msvc2010:DEFINES += GLEW_STATIC
+ win32-msvc2012:DEFINES += GLEW_STATIC
+ win32-msvc2015:DEFINES += GLEW_STATIC
+ 
+-CONFIG(system_glew):LIBS += -lGLEW
+-
+ #DEFINES += GLEW_STATIC
+ 
+ # This removes the need of XSERVER to run meshlabserver
+diff --git a/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro b/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro
+index e7ead0eb..c920a177 100755
+--- a/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro
++++ b/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro
+@@ -6,8 +6,7 @@ GLEWDIR = ../../../../external/glew-1.5.1
+ win32-msvc2005:DEFINES += GLEW_STATIC
+ win32-msvc2008:DEFINES += GLEW_STATIC 
+ 
+-INCLUDEPATH  *= ../.. $$VCGDIR
+-!CONFIG(system_glew): INCLUDEPATH *= $$GLEWDIR/include
++INCLUDEPATH  *= ../.. $$VCGDIR $$GLEWDIR/include
+ DEPENDPATH += $$VCGDIR
+ 
+ # the following line is to hide the hundred of warnings about the deprecated
+@@ -110,7 +109,7 @@ QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
+ LIBS +=    -lGLEW 
+ LIBS +=    -lkyotocabinet
+ 
+-!CONFIG(system_glew): QMAKE_LIBDIR += $$GLEWDIR/lib
++QMAKE_LIBDIR += $$GLEWDIR/lib
+ QMAKE_LIBDIR += ../../../../external/kyotocabinet-1.2.34
+ 
+ 
+diff --git a/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro b/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro
+index f5d5832d..bb0995b4 100644
+--- a/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro
++++ b/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro
+@@ -14,9 +14,8 @@ SOURCES     += filter_multiscale_align.cpp \
+ TARGET       = filter_multiscale_align
+ 
+ ## Dependencies
+-INCLUDEPATH += lib
+-!CONFIG(system_eigen3): INCLUDEPATH *= $$VCGDIR/eigenlib   #needed by Grenaille
+-CONFIG(system_eigen3):  INCLUDEPATH *= $$EIGENDIR   #needed by Grenaille
++INCLUDEPATH += lib \
++               $$VCGDIR/eigenlib   #needed by Grenaille
+ 
+ 
+ unix: QMAKE_CXXFLAGS += -DQ_OS_LINUX
+diff --git a/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro b/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro
+index 604cccb2..37ac72a9 100644
+--- a/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro
++++ b/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro
+@@ -38,7 +38,17 @@ win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
+ linux-g++:LIBS	+= -lbz2

+ mac:LIBS   += -lbz2

+ 

+-!CONFIG(system_bzip2):INCLUDEPATH += ../../external/bzip2-1.0.5

++win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5

++win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5

++win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5

++win32-msvc2012:INCLUDEPATH += ../../external/bzip2-1.0.5

++win32-msvc2013:INCLUDEPATH += ../../external/bzip2-1.0.5

++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 --git a/src/plugins_unsupported/edit_fit/edit_fit.pro b/src/plugins_unsupported/edit_fit/edit_fit.pro
+index 3338c831..85bf9e24 100644
+--- a/src/plugins_unsupported/edit_fit/edit_fit.pro
++++ b/src/plugins_unsupported/edit_fit/edit_fit.pro
+@@ -13,11 +13,8 @@ HEADERS       = edit_fit_factory.h \
+ SOURCES       = edit_fit_factory.cpp \

+ 				editfit.cpp\

+   				fittoolbox.cpp\

+-  				primitive.cpp

+-!CONFIG(system_glew): SOURCES += $$GLEWCODE

+-CONFIG(system_glew) {

+-    linux: LIBS += -lGLEW

+-}

++  				primitive.cpp\

++				$$GLEWCODE				

+ 

+ FORMS 	  += fittoolbox.ui

+ 

+diff --git a/src/plugins_unsupported/editpaint/editpaint.pro b/src/plugins_unsupported/editpaint/editpaint.pro
+index 8d022b20..93bf48b2 100755
+--- a/src/plugins_unsupported/editpaint/editpaint.pro
++++ b/src/plugins_unsupported/editpaint/editpaint.pro
+@@ -8,11 +8,8 @@ HEADERS   = edit_paint_factory.h \
+ 			 
+ SOURCES   = edit_paint_factory.h \
+ 			editpaint.cpp \
++			$$GLEWCODE  \
+ 			paintbox.cpp
+-!CONFIG(system_glew): SOURCES += $$GLEWCODE
+-CONFIG(system_glew) {
+-    linux: LIBS += -lGLEW
+-}
+ 	
+ TARGET = editpaint
+ 
+diff --git a/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro b/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro
+index 24f279c2..c4119b60 100644
+--- a/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro
++++ b/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro
+@@ -3,11 +3,8 @@ include (../../shared.pri)
+ HEADERS       = filter_rangemap.h

+ 

+ SOURCES       = filter_rangemap.cpp \ 

+-		../../meshlab/filterparameter.cpp

+-!CONFIG(system_glew): SOURCES += $$GLEWCODE

+-CONFIG(system_glew) {

+-    linux: LIBS += -lGLEW

+-}

++		../../meshlab/filterparameter.cpp \

++		$$GLEWCODE

+ 

+ TARGET        = filter_rangemap

+ 

+diff --git a/src/plugins_unsupported/io_epoch/io_epoch.pro b/src/plugins_unsupported/io_epoch/io_epoch.pro
+index 7824f246..933ed59b 100644
+--- a/src/plugins_unsupported/io_epoch/io_epoch.pro
++++ b/src/plugins_unsupported/io_epoch/io_epoch.pro
+@@ -32,7 +32,12 @@ win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
+ win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a

+ linux-g++:LIBS	+= -lbz2

+ 

+-!CONFIG(system_bz2): INCLUDEPATH  *= ../../external/bzip2-1.0.5

++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

+ 

+diff --git a/src/plugins_unsupported/render_rm/render_rm.pro b/src/plugins_unsupported/render_rm/render_rm.pro
+index 24d21686..575116e1 100644
+--- a/src/plugins_unsupported/render_rm/render_rm.pro
++++ b/src/plugins_unsupported/render_rm/render_rm.pro
+@@ -16,11 +16,8 @@ SOURCES  = rmmeshrender.cpp \
+            glstateholder.cpp \
+            parser/RmPass.cpp \
+            parser/RmXmlParser.cpp \
+-           parser/UniformVar.cpp
+-!CONFIG(system_glew): SOURCES += $$GLEWCODE
+-CONFIG(system_glew) {
+-    linux: LIBS += -lGLEW
+-}
++           parser/UniformVar.cpp \
++		   $$GLEWCODE
+ 
+ FORMS    = rmShadowDialog.ui
+ 
+diff --git a/src/shared.pri b/src/shared.pri
+index 4a10924b..2d51ad89 100644
+--- a/src/shared.pri
++++ b/src/shared.pri
+@@ -2,8 +2,7 @@
+ 
+ include (general.pri)
+ VCGDIR = ../$$VCGDIR
+-# only adjust relative path if we're not using system Eigen
+-!CONFIG(system_eigen3):EIGENDIR = ../$$EIGENDIR
++EIGENDIR = ../$$EIGENDIR
+ 
+ TEMPLATE      = lib
+ CONFIG       += plugin
+@@ -28,8 +27,7 @@ win32-msvc2013:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
+ win32-msvc2015:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
+ win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
+ 
+-INCLUDEPATH  *= ../.. $$VCGDIR $$EIGENDIR
+-!CONFIG(system_glew): INCLUDEPATH *=  ../$$GLEWDIR/include
++INCLUDEPATH  *= ../.. $$VCGDIR $$EIGENDIR ../$$GLEWDIR/include
+ DEPENDPATH += ../.. $$VCGDIR
+ 
+ # the following line is to hide the hundred of warnings about the deprecated
+-- 
+2.24.0
+