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