]> git.pld-linux.org Git - packages/meshlab.git/blame - meshlab-1.3.2-sharedlib.patch
projects / packages / meshlab.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
cleanup, simplify, move patch comments inside patches
[packages/meshlab.git] / meshlab-1.3.2-sharedlib.patch
CommitLineData
e5073aa2
ER		 1# Fedora-specific patches to use shared libraries, and to put plugins and
2# shaders in appropriate directories
cf6fe618
AM		 3diff -up meshlab-1.3.2/meshlab/src/common/common.pro.sharedlib meshlab-1.3.2/meshlab/src/common/common.pro
4--- meshlab-1.3.2/meshlab/src/common/common.pro.sharedlib 2012-07-30 23:42:56.000000000 -0600
5+++ meshlab-1.3.2/meshlab/src/common/common.pro 2013-02-26 09:43:25.574027223 -0700
6@@ -1,9 +1,6 @@
7 include (../general.pri)
8 EXIF_DIR = ../external/jhead-2.95
9
10-
11-GLEWCODE = $$GLEWDIR/src/glew.c
12-
13 win32-msvc2005:DESTDIR = ../distrib
14 win32-msvc2008:DESTDIR = ../distrib
15 win32-msvc2010:DESTDIR = ../distrib
16@@ -52,8 +49,7 @@ echo "linked shader dir"; \
17 fi;\
18 "
19 INCLUDEPATH *= ../.. \
20- $$VCGDIR \
21- $$GLEWDIR/include
22+ $$VCGDIR
23 TEMPLATE = lib
24 linux-g++:CONFIG += dll
25 linux-g++:DESTDIR = ../distrib
26@@ -75,7 +71,6 @@ QT += script
27 TARGET =
28 DEPENDPATH += .
29 INCLUDEPATH += . $$EXIF_DIR
30-DEFINES += GLEW_STATIC
31 win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
32 win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
33
34@@ -106,7 +101,6 @@ SOURCES += filterparameter.cpp \
35 mlapplication.cpp \
36 scriptsyntax.cpp \
37 searcher.cpp \
38- $$GLEWCODE \
39 meshlabdocumentxml.cpp \
40 meshlabdocumentbundler.cpp
41
42diff -up meshlab-1.3.2/meshlab/src/external/external.pro.sharedlib meshlab-1.3.2/meshlab/src/external/external.pro
43--- meshlab-1.3.2/meshlab/src/external/external.pro.sharedlib 2012-05-30 08:24:24.000000000 -0600
44+++ meshlab-1.3.2/meshlab/src/external/external.pro 2013-02-26 09:43:25.574027223 -0700
45@@ -2,11 +2,5 @@ config += debug_and_release
46
47 TEMPLATE = subdirs
48
49-SUBDIRS = lib3ds-1.3.0/lib3ds \
50- bzip2-1.0.5/bzip2-1.0.5.pro \
51- muparser_v132/src \
52- levmar-2.3/levmar-2.3.pro \
53- structuresynth/structuresynth.pro \
54- OpenCTM-1.0.3/openctm.pro \
55+SUBDIRS = structuresynth/structuresynth.pro \
56 jhead-2.95/jhead-2.95.pro
57-# openkinect/openkinect.pro
58diff -up meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro
59--- meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro.sharedlib 2012-05-30 08:32:44.000000000 -0600
60+++ meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro 2013-02-26 09:43:25.575027223 -0700
61@@ -129,7 +129,7 @@ win32-g++:LIBS += -L../external/
62 # win32-g++:release:LIBS += -L../common/release -lcommon
63 #}
64
65-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
66+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
67 linux-g++:QMAKE_RPATHDIR += ../distrib
68 linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
69 linux-g++-32:QMAKE_RPATHDIR += ../distrib
70diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
71--- meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib 2013-02-26 10:05:31.025983842 -0700
72+++ meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro 2013-02-26 10:08:53.259977223 -0700
73@@ -32,16 +32,13 @@ RESOURCES = edit_arc3D.qrc
74 win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib\r
75 win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib\r
76 win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a\r
77-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a\r
78-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a\r
79-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a\r
80+linux-g++:LIBS += -lbz2\r
81+linux-g++-32:LIBS += -lbz2\r
82+linux-g++-64:LIBS += -lbz2\r
83 \r
84 win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5\r
85 win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5\r
86 win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5\r
87-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5\r
88-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5\r
89-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5\r
90 \r
91 mac:LIBS += -lbz2\r
92 \r
93diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro
94--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib 2011-10-14 10:38:01.000000000 -0600
95+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro 2013-02-26 09:43:25.575027223 -0700
96@@ -6,15 +6,13 @@ SOURCES += filter_func.cpp
97 \r
98 TARGET = filter_func\r
99 \r
100-INCLUDEPATH += ../../external/muparser_v132/include\r
101-\r
102 # Note: we need static libs so when building muparser lib use \r
103 # ./configure --enable-shared=no\r
104 \r
105 win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib\r
106 win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib\r
107 macx:LIBS += $$MACLIBDIR/libmuparser.a\r
108-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a\r
109+linux-g++:LIBS += -lmuparser\r
110 linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a\r
111 linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a\r
112 win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a\r
113diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
114--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2011-10-14 10:37:59.000000000 -0600
115+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2013-02-26 09:43:25.576027223 -0700
116@@ -23,8 +23,7 @@ HEADERS += ./diamond_sampler.h \
117 SOURCES += ./filter_isoparametrization.cpp \r
118 \r
119 TARGET = filter_isoparametrization\r
120-INCLUDEPATH += ./ \\r
121- ../../external/levmar-2.3/\r
122+INCLUDEPATH += ./\r
123 \r
124 win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP\r
125 win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP\r
126@@ -47,7 +46,7 @@ win32-msvc.net:LIBS += ../../external/li
127 win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib\r
128 win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib\r
129 win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar\r
130-linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar\r
131+linux-g++:LIBS += -llevmar\r
132 linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar\r
133 linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar\r
134 macx:LIBS += $$MACLIBDIR/liblevmar.a\r
135diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
136--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2011-10-14 10:37:59.000000000 -0600
137+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2013-02-26 09:43:25.576027223 -0700
138@@ -14,7 +14,7 @@
139
140 #include <local_parametrization.h>
141 #include <mesh_operators.h>
142-#include <lm.h>
143+#include <levmar.h>
144 #include <uv_grid.h>
145
146 #include "opt_patch.h"
147diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
148--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2011-10-14 10:37:59.000000000 -0600
149+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2013-02-26 09:43:25.577027223 -0700
150@@ -34,7 +34,7 @@
151 #include <vcg/space/color4.h>
152 #include <dual_coord_optimization.h>
153 #include <float.h>
154-#include <lm.h>
155+#include <levmar.h>
156 #ifndef _MESHLAB
157 #include <wrap/io_trimesh/export_ply.h>
158 #endif
159diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
160--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib 2012-05-30 07:57:47.000000000 -0600
161+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h 2013-02-26 09:43:25.577027223 -0700
162@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
163 \r
164 #include <list>\r
165 \r
166-#include "../../external/levmar-2.3/lm.h"\r
167+#include <levmar.h>\r
168 \r
169 \r
170 struct LevmarCorrelation {\r
171diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h
172--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib 2012-05-30 07:57:47.000000000 -0600
173+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h 2013-02-26 09:43:25.578027223 -0700
174@@ -5,7 +5,7 @@
175 #include "alignset.h"\r
176 \r
177 #include "parameters.h"\r
178-#include "../../external/levmar-2.3/lm.h"\r
179+#include <levmar.h>\r
180 \r
181 #include <iostream>\r
182 #include <fstream>\r
183diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro
184--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib 2011-10-14 10:35:23.000000000 -0600
185+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro 2013-02-26 09:43:25.579027223 -0700
186@@ -1,17 +1,15 @@
187 include (../../shared.pri)
188
189-QTSOAPDIR = ../../external/qtsoap-2.7_1/src
190-
191-INCLUDEPATH += $$QTSOAPDIR
192+INCLUDEPATH += /usr/include/QtSoap
193
194 HEADERS += filter_photosynth.h \
195- synthData.h \
196- $$QTSOAPDIR/qtsoap.h
197+ synthData.h
198
199 SOURCES += filter_photosynth.cpp \
200- downloader.cpp \
201- $$QTSOAPDIR/qtsoap.cpp
202+ downloader.cpp
203
204 TARGET = filter_photosynth
205
206+linux-g++:LIBS += -lqtsoap
207+
208 QT += network
209diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro
210--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib 2011-10-14 10:35:34.000000000 -0600
211+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2013-02-26 09:43:25.580027223 -0700
212@@ -8,28 +8,8 @@ HEADERS += filter_qhull.h \
213 SOURCES += filter_qhull.cpp \
214 qhull_tools.cpp
215
216-HEADERS += ../../external/qhull-2003.1/src/geom.h \
217- ../../external/qhull-2003.1/src/io.h \
218- ../../external/qhull-2003.1/src/mem.h \
219- ../../external/qhull-2003.1/src/merge.h \
220- ../../external/qhull-2003.1/src/poly.h \
221- ../../external/qhull-2003.1/src/qhull.h \
222- ../../external/qhull-2003.1/src/qset.h \
223- ../../external/qhull-2003.1/src/stat.h \
224- ../../external/qhull-2003.1/src/user.h
225+INCLUDEPATH += /usr/include/qhull
226
227-SOURCES += ../../external/qhull-2003.1/src/geom.c \
228- ../../external/qhull-2003.1/src/geom2.c \
229- ../../external/qhull-2003.1/src/global.c \
230- ../../external/qhull-2003.1/src/io.c \
231- ../../external/qhull-2003.1/src/mem.c \
232- ../../external/qhull-2003.1/src/merge.c \
233- ../../external/qhull-2003.1/src/poly.c \
234- ../../external/qhull-2003.1/src/poly2.c \
235- ../../external/qhull-2003.1/src/qconvex.c \
236- ../../external/qhull-2003.1/src/qhull.c \
237- ../../external/qhull-2003.1/src/qset.c \
238- ../../external/qhull-2003.1/src/stat.c \
239- ../../external/qhull-2003.1/src/user.c
240+LIBS += -lqhull
241
242-TARGET = filter_qhull
243\ No newline at end of file
244+TARGET = filter_qhull
245diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h
246--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib 2011-10-14 10:35:34.000000000 -0600
247+++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2013-02-26 09:43:25.581027223 -0700
248@@ -55,14 +55,14 @@ extern "C"
249 #endif\r
250 #include <stdio.h>\r
251 #include <stdlib.h>\r
252-#include "../../external/qhull-2003.1/src/qhull.h"\r
253-#include "../../external/qhull-2003.1/src/mem.h"\r
254-#include "../../external/qhull-2003.1/src/qset.h"\r
255-#include "../../external/qhull-2003.1/src/geom.h"\r
256-#include "../../external/qhull-2003.1/src/merge.h"\r
257-#include "../../external/qhull-2003.1/src/poly.h"\r
258-#include "../../external/qhull-2003.1/src/io.h"\r
259-#include "../../external/qhull-2003.1/src/stat.h"\r
260+#include <qhull/qhull.h>\r
261+#include <qhull/mem.h>\r
262+#include <qhull/qset.h>\r
263+#include <qhull/geom.h>\r
264+#include <qhull/merge.h>\r
265+#include <qhull/poly.h>\r
266+#include <qhull/io.h>\r
267+#include <qhull/stat.h>\r
268 #if defined(__cplusplus)\r
269 }\r
270 #endif\r
271diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
272--- meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2011-10-14 10:36:53.000000000 -0600
273+++ meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2013-02-26 09:43:25.582027223 -0700
274@@ -14,7 +14,7 @@ SOURCES += meshio.cpp \
275
276 TARGET = io_3ds
277
278-INCLUDEPATH += ../../external/lib3ds-1.3.0/
279+INCLUDEPATH += /usr/include/lib3ds/
280
281 # Notes on the paths of lib3ds files.
282 # Once you have compiled the library put the lib files in a dir named lib/XXX/
283@@ -25,9 +25,7 @@ win32-msvc.net:LIBS += ../../external/li
284 win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib
285 win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib
286 win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a
287-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
288-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
289-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
290+linux-g++:LIBS += -l3ds
291
292 # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
293
294diff -up meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro
295--- meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-10-14 10:34:48.000000000 -0600
296+++ meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro 2013-02-26 09:43:25.583027223 -0700
297@@ -1,5 +1,3 @@
298-GLEWDIR = ../external/glew-1.5.1
299-
300 HEADERS =
301
302 SOURCES = mainserver.cpp
303@@ -25,12 +23,8 @@ win32-msvc2005: LIBS += -L../distrib -l
304 win32-msvc2008: LIBS += -L../distrib -lcommon
305 win32-msvc2010: LIBS += -L../distrib -lcommon
306 win32-g++: LIBS += -L../distrib -lcommon
307-linux-g++: LIBS += -L../distrib -lcommon
308+linux-g++: LIBS += -L../distrib -lcommon -lGLEW
309 linux-g++:QMAKE_RPATHDIR += ../distrib
310-linux-g++-32: LIBS += -L../distrib -lcommon
311-linux-g++-32:QMAKE_RPATHDIR += ../distrib
312-linux-g++-64: LIBS += -L../distrib -lcommon
313-linux-g++-64:QMAKE_RPATHDIR += ../distrib
314 #CONFIG (release,debug | release) {
315 # win32-msvc2005:release: LIBS += -L../common/release -lcommon
316 # win32-msvc2008:release: LIBS += -L../common/release -lcommon
317@@ -43,7 +37,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC
318
319 #DEFINES += GLEW_STATIC
320
321-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include
322+INCLUDEPATH += . .. ../../../vcglib
323 CONFIG += stl
324 CONFIG += console
325
326diff -up meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h
327--- meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib 2012-04-05 03:05:12.000000000 -0600
328+++ meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h 2013-02-26 09:43:25.583027223 -0700
329@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
330 \r
331 #include <list>\r
332 \r
333-#include "../../external/levmar-2.3/lm.h"\r
334+#include <levmar.h>\r
335 \r
336 \r
337 struct LevmarCorrelation {\r
338diff -up meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h
339--- meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib 2012-04-05 03:05:12.000000000 -0600
340+++ meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2013-02-26 09:43:25.584027223 -0700
341@@ -5,7 +5,7 @@
342 #include "alignset.h"\r
343 \r
344 #include "parameters.h"\r
345-#include "../../external/levmar-2.3/lm.h"\r
346+#include <levmar.h>\r
347 \r
348 #include <iostream>\r
349 #include <fstream>\r
350diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h
351--- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib 2011-10-14 10:30:46.000000000 -0600
352+++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h 2013-02-26 09:43:25.585027223 -0700
353@@ -30,7 +30,7 @@
354 #include <vcg/complex/allocate.h>
355 #include <vcg/complex/algorithms/subset.h>
356 #include <vcg/space/index/grid_static_ptr.h>
357-#include <lib/levmar/lm.h>
358+#include <levmar.h>
359
360 #include "frame.h"
361
362@@ -313,4 +313,4 @@ static void eval_only_k( double *x,doubl
363
364 };// end of class
365
366-}// end of subspace
367\ No newline at end of file
368+}// end of subspace
369diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h
370--- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib 2012-06-27 03:34:59.000000000 -0600
371+++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h 2013-02-26 09:43:25.620027222 -0700
372@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
373 \r
374 #include <list>\r
375 \r
376-#include "../../external/levmar-2.3/lm.h"\r
377+#include <levmar.h>\r
378 \r
379 \r
380 struct LevmarCorrelation {\r
381diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h
382--- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib 2012-06-27 03:34:59.000000000 -0600
383+++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h 2013-02-26 09:43:25.621027222 -0700
384@@ -5,7 +5,7 @@
385 #include "alignset.h"\r
386 \r
387 #include "parameters.h"\r
388-#include "../../external/levmar-2.3/lm.h"\r
389+#include <levmar.h>\r
390 \r
391 #include <iostream>\r
392 #include <fstream>\r
393diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro
394--- meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib 2013-02-26 10:07:51.957979230 -0700
395+++ meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro 2013-02-26 10:08:26.850978087 -0700
396@@ -30,16 +30,13 @@ QT += xml
397 win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib\r
398 win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib\r
399 win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a\r
400-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a\r
401-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a\r
402-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a\r
403+linux-g++:LIBS += -lbz2\r
404+linux-g++-32:LIBS += -lbz2\r
405+linux-g++-64:LIBS += -lbz2\r
406 \r
407 win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5\r
408 win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5\r
409 win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5\r
410-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5\r
411-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5\r
412-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5\r
413 \r
414 mac:LIBS += -lbz2\r
415 \r
A system for processing and editing unstructured 3D triangular meshes
This page took 0.105994 seconds and 4 git commands to generate.