Remove direct references to "external" from source files

src/fgt/filter_decompose/filter_decompose.pro

@@ -11,7 +11,7 @@ SOURCES       += \
 ../../external/maxflow-v2.21.src/adjacency_list/graph.cpp \
 ../../../../vcglib/wrap/ply/plylib.cpp \
     filter_decomposer.cpp
-
+INCLUDEPATH *= ../../external/maxflow-v2.21.src/
 TARGET        = filter_decomposer
 
 

src/fgt/filter_decompose/graph_builder.h

@@ -1,4 +1,4 @@
-#include "../../external/maxflow-v2.21.src/adjacency_list/graph.h"
+#include "adjacency_list/graph.h"
 #include <stdlib.h>
 
 #ifndef GRAPHBUILDER_H

src/meshlabplugins/edit_align/edit_align.pro

@@ -39,7 +39,7 @@ CONFIG(system_glew) {
     linux: LIBS += -lGLEW
 }
                 
-INCLUDEPATH += ../../external
+INCLUDEPATH += ../../external/newuoa/include
 
 FORMS 	  += alignDialog.ui
 TARGET       = edit_align

src/meshlabplugins/edit_align/point_matching_scale.cpp

@@ -1,5 +1,5 @@
 #include "point_matching_scale.h"
-#include <newuoa/include/newuoa.h>
+#include <newuoa.h>
 
 #include <vcg/space/point3.h>
 #include <vcg/space/box3.h>

src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro

@@ -25,6 +25,8 @@ RESOURCES     = edit_mutualcorrs.qrc
 
 FORMS         = edit_mutualcorrsDialog.ui
 
+INCLUDEPATH *= ../../external/levmar-2.3 ../../external/newuoa/include
+
 win32-msvc:  LIBS += ../../external/lib/win32-msvc/levmar.lib
 win32-g++:LIBS += -L../../external -llevmar
 linux-g++:LIBS += -llevmar

src/meshlabplugins/edit_mutualcorrs/levmarmethods.h

@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 
 struct LevmarCorrelation {

src/meshlabplugins/edit_mutualcorrs/solver.cpp

@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include "edit_mutualcorrs.h"
 #include <vcg/math/shot.h>
-#include "../../external/newuoa/include/newuoa.h"
+#include "newuoa.h"
 
 
 #include "solver.h"
@@ -426,7 +426,7 @@ int Solver::levmar(AlignSet *_align, MutualInfo *_mutual, Shot &shot) {
 
 double Solver::calculateError2( Shot &shot){
     //E' una pezza, andrebbe meglio pensato. Va a beccare direttamente le strutture dati PointCorrespondence di base.
-    //align già è sicuramente settato perchè lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
+    //align gi<EFBFBD> <20> sicuramente settato perch<63> lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
     std::vector<Correspondence> correspList = align->correspList;
     double error = 0;
    

src/meshlabplugins/edit_mutualcorrs/solver.h

@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 #include <iostream>
 #include <fstream>

src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro

@@ -20,3 +20,4 @@ SOURCES       += filter_mutualglobal.cpp \
 		
 TARGET        = filter_mutualglobal
 
+INCLUDEPATH *= ../../external/levmar-2.3 ../../external/newuoa/include

src/meshlabplugins/filter_mutualglobal/levmarmethods.h

@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 
 struct LevmarCorrelation {

src/meshlabplugins/filter_mutualglobal/solver.cpp

@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include "filter_mutualglobal.h"
 #include <vcg/math/shot.h>
-#include "../../external/newuoa/include/newuoa.h"
+#include "newuoa.h"
 
 
 #include "solver.h"
@@ -677,7 +677,7 @@ double Solver::calculateError(std::list<Correlation> *corrs, Shot &shot){
 
 double Solver::calculateError2( Shot &shot){
 	//E' una pezza, andrebbe meglio pensato. Va a beccare direttamente le strutture dati PointCorrespondence di base.
-	//align già è sicuramente settato perchè lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
+	//align gi<EFBFBD> <20> sicuramente settato perch<63> lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
 	QList<PointCorrespondence*> *correspList = align->correspList;
 	double error = 0;
 	int count=0;

src/meshlabplugins/filter_mutualglobal/solver.h

@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 #include <iostream>
 #include <fstream>

src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro

@@ -20,4 +20,6 @@ SOURCES       += filter_mutualinfo.cpp \
 		
 TARGET        = filter_mutualinfo
 
+INCLUDEPATH *= ../../external/levmar-2.3 ../../external/newuoa/include
+
 include (../../shared_post.pri)

src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h

@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 
 struct LevmarCorrelation {

src/meshlabplugins/filter_mutualinfoxml/solver.cpp

@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include "filter_mutualinfo.h"
 #include <vcg/math/shot.h>
-#include "../../external/newuoa/include/newuoa.h"
+#include "newuoa.h"
 
 
 #include "solver.h"
@@ -574,7 +574,7 @@ double Solver::calculateError(std::list<Correlation> *corrs, Shot &shot){
 
 double Solver::calculateError2( Shot &shot){
     //E' una pezza, andrebbe meglio pensato. Va a beccare direttamente le strutture dati PointCorrespondence di base.
-    //align già è sicuramente settato perchè lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
+    //align gi<EFBFBD> <20> sicuramente settato perch<63> lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
     QList<PointCorrespondence*> *correspList = align->correspList;
     double error = 0;
     int count=0;

src/meshlabplugins/filter_mutualinfoxml/solver.h

@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 #include <iostream>
 #include <fstream>