From e2f95ef545b2119e97c54a6c8c346db2ec79e088 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni <paolo.cignoni@isti.cnr.it>
Date: Mon, 9 Apr 2018 17:00:11 +0200
Subject: [PATCH] A bit of .pro cleaning

---
 src/common/common.pro | 23 ++++-------------------
 src/general.pri       |  2 +-
 src/shared.pri        | 10 ----------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/common/common.pro b/src/common/common.pro
index b8a497fdb..782928768 100644
--- a/src/common/common.pro
+++ b/src/common/common.pro
@@ -12,16 +12,6 @@ win32-msvc2015:DESTDIR = ../distrib
 win32-msvc:DESTDIR = ../distrib
 win32-g++:DLLDESTDIR = ../distrib
 
-# CONFIG(release,debug | release) {
-# win32-msvc2005:DESTDIR     = ./release
-# win32-msvc2008:DESTDIR     = ./release
-# win32-msvc2010:DESTDIR     = ./release
-# win32-msvc2012:DESTDIR     = ./release
-# win32-g++:DLLDESTDIR     = ./release
-# }
-
-mac:DLLDESTDIR = .
-
 # The following lines are necessary to avoid that when you re-compile everything you still find old dll in the plugins dir
 macx:QMAKE_CLEAN +=  ../distrib/plugins/*.dylib
 win32:QMAKE_CLEAN +=  ../distrib/plugins/*.dll
@@ -57,7 +47,8 @@ fi;\
 INCLUDEPATH *= ../.. \
     $$VCGDIR \
     $$EIGENDIR \
-    $$GLEWDIR/include
+    $$GLEWDIR/include \
+    $$EXIF_DIR
 TEMPLATE = lib
 
 linux:CONFIG += dll
@@ -81,15 +72,9 @@ 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
-win32-msvc2012:DEFINES += _CRT_SECURE_NO_WARNINGS
-win32-msvc2013:DEFINES += _CRT_SECURE_NO_WARNINGS
-win32-msvc2015:DEFINES += _CRT_SECURE_NO_WARNINGS
-win32-msvc2017:DEFINES += _CRT_SECURE_NO_WARNINGS
+
+win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
 
 
 # Input
diff --git a/src/general.pri b/src/general.pri
index 1976de344..d12a066eb 100644
--- a/src/general.pri
+++ b/src/general.pri
@@ -7,7 +7,7 @@ DEFINES += MESHLAB_SCALAR=float
 
 VCGDIR   = ../../../vcglib
 EIGENDIR = $$VCGDIR/eigenlib
-GLEWDIR = ../external/glew-1.7.0
+GLEWDIR = ../external/glew-2.1.0
 
 CONFIG += c++11
 
diff --git a/src/shared.pri b/src/shared.pri
index 06f19f932..2d51ad899 100644
--- a/src/shared.pri
+++ b/src/shared.pri
@@ -27,19 +27,9 @@ win32-msvc2013:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
 win32-msvc2015:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
 win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
 
-# uncomment to try Eigen
-# DEFINES += VCG_USE_EIGEN
-# CONFIG += warn_off
-
 INCLUDEPATH  *= ../.. $$VCGDIR $$EIGENDIR ../$$GLEWDIR/include
 DEPENDPATH += ../.. $$VCGDIR
 
-# Uncomment these if you want to experiment with newer gcc compilers
-# (here using the one provided with macports)
-# macx-g++:QMAKE_CXX=g++-mp-4.3
-# macx-g++:QMAKE_CXXFLAGS_RELEASE -= -Os
-# macx-g++:QMAKE_CXXFLAGS_RELEASE += -O3
-
 # the following line is to hide the hundred of warnings about the deprecated
 # old printf are all around the code
 win32-msvc2013:DEFINES	+= _CRT_SECURE_NO_DEPRECATE