1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
diff --git a/common/common.pro b/common/common.pro
index cf4cccff..e75f1bb4 100644
--- a/common/common.pro
+++ b/common/common.pro
@@ -1,7 +1,4 @@
include (../general.pri)
-EXIF_DIR = ../external/jhead-2.95
-
-GLEWCODE = $$GLEWDIR/src/glew.c
win32-msvc2005:DESTDIR = ../distrib
win32-msvc2008:DESTDIR = ../distrib
@@ -44,7 +41,6 @@ fi;\
INCLUDEPATH *= ../.. \
$$VCGDIR \
$$EIGENDIR \
- $$GLEWDIR/include \
$$EXIF_DIR
TEMPLATE = lib
@@ -69,7 +65,6 @@ QT += script
TARGET = common
DEPENDPATH += .
-DEFINES += GLEW_STATIC
win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
@@ -102,7 +97,6 @@ SOURCES += filterparameter.cpp \
mlapplication.cpp \
scriptsyntax.cpp \
searcher.cpp \
- $$GLEWCODE \
meshlabdocumentxml.cpp \
meshlabdocumentbundler.cpp \
ml_shared_data_context.cpp
diff --git a/general.pri b/general.pri
index 4cb5102c..b90d7546 100644
--- a/general.pri
+++ b/general.pri
@@ -7,7 +7,6 @@ DEFINES += MESHLAB_SCALAR=float
VCGDIR = ../../../vcglib
EIGENDIR = $$VCGDIR/eigenlib
-GLEWDIR = ../external/glew-2.1.0
CONFIG += c++11
diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
index 5f542b87..fbf27bff 100644
--- a/meshlab/meshlab.pro
+++ b/meshlab/meshlab.pro
@@ -1,7 +1,6 @@
include (../general.pri)
#CONFIG += debug_and_release
DESTDIR = ../distrib
-EXIF_DIR = ../external/jhead-2.95
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
@@ -9,9 +8,7 @@ INCLUDEPATH *= . \
.. \
../.. \
$$VCGDIR \
- $$EIGENDIR \
- $$GLEWDIR/include \
- $$EXIF_DIR
+ $$EIGENDIR
DEPENDPATH += $$VCGDIR \
$$VCGDIR/vcg \
$$VCGDIR/wrap
@@ -154,7 +151,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-g++ -ljhead -L../distrib -lcommon -lGLU
+linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
linux:QMAKE_RPATHDIR += ../distrib
# uncomment in your local copy only in emergency cases.
diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro
index ef6b654c..026c66be 100644
--- a/meshlabplugins/filter_func/filter_func.pro
+++ b/meshlabplugins/filter_func/filter_func.pro
@@ -8,7 +8,6 @@ TARGET = filter_func
DEFINES += _UNICODE
-INCLUDEPATH += ../../external/muparser_v225/include
# Note: we need static libs so when building muparser lib use
# ./configure --enable-shared=no
@@ -22,7 +21,4 @@ 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
win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro
index 85b4a744..2cfad82d 100644
--- a/meshlabplugins/io_3ds/io_3ds.pro
+++ b/meshlabplugins/io_3ds/io_3ds.pro
@@ -10,11 +10,9 @@ HEADERS = meshio.h \
SOURCES += meshio.cpp \
-DEFINES += LIB3DS_STATIC
TARGET = io_3ds
-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/
@@ -26,9 +24,6 @@ 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
# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
diff --git a/meshlabplugins/io_ctm/io_ctm.pro b/meshlabplugins/io_ctm/io_ctm.pro
index fc060de0..59528e0c 100644
--- a/meshlabplugins/io_ctm/io_ctm.pro
+++ b/meshlabplugins/io_ctm/io_ctm.pro
@@ -3,7 +3,6 @@ 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
win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
@@ -21,8 +20,5 @@ win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/openctm.lib
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/openctm.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/openctm.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a
-linux-g++:LIBS += $$PWD/../../external/lib/linux-g++/libopenctm.a
-linux-g++-32:LIBS += $$PWD/../../external/lib/linux-g++-32/libopenctm.a
-linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/libopenctm.a
#macx:LIBS += ../../external/lib/macx/libopenctm.a
macx:LIBS += $$MACLIBDIR/libopenctm.a
diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro
index e97962a1..058e2512 100644
--- a/meshlabserver/meshlabserver.pro
+++ b/meshlabserver/meshlabserver.pro
@@ -29,7 +29,7 @@ win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
win32-g++: LIBS += -L../distrib -lcommon
-linux: LIBS += -L../distrib -lcommon
+linux: LIBS += -L../distrib -lcommon -lGLEW
linux:QMAKE_RPATHDIR += ../distrib
#CONFIG (release,debug | release) {
# win32-msvc2005:release: LIBS += -L../common/release -lcommon
|
GitWeb