Attachment #279679 for bug #208359

Lines 1-6 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/common/common.pro (-4 / +2 lines)
1	VCGDIR = ../../../vcglib	1	VCGDIR = ../../../vcglib
2	GLEWDIR = ../external/glew-1.5.1	2	GLEWDIR = /usr/include/GL
3	GLEWCODE = $$GLEWDIR/src/glew.c
4		3
5		4
6	win32-msvc2005:DESTDIR = ../distrib	5	win32-msvc2005:DESTDIR = ../distrib
Lines 35-41 Link Here
35	cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/"	34	cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/"
36	INCLUDEPATH *= ../.. \	35	INCLUDEPATH *= ../.. \
37	$$VCGDIR \	36	$$VCGDIR \
38	$$GLEWDIR/include	37	$$GLEWDIR
39	TEMPLATE = lib	38	TEMPLATE = lib
40	linux-g++:CONFIG += dll	39	linux-g++:CONFIG += dll
41	linux-g++:DESTDIR = ../distrib	40	linux-g++:DESTDIR = ../distrib
Lines 83-87 Link Here
83	scriptinterface.cpp \	82	scriptinterface.cpp \
84	mlparameter.cpp \	83	mlparameter.cpp \
85	xmlfilterinfo.cpp \	84	xmlfilterinfo.cpp \
86	$$GLEWCODE \
87	meshlabdocumentxml.cpp	85	meshlabdocumentxml.cpp

Lines 2-10 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/external/external.pro (-6 / +1 lines)
2		2
3	TEMPLATE = subdirs	3	TEMPLATE = subdirs
4		4
5	SUBDIRS = lib3ds-1.3.0/lib3ds \	5	SUBDIRS = structuresynth/structuresynth.pro
6	bzip2-1.0.5/bzip2-1.0.5.pro \
7	muparser_v132/src \
8	levmar-2.3/levmar-2.3.pro \
9	structuresynth/structuresynth.pro
10	# openkinect/openkinect.pro

Lines 14-20 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_func/filter_func.pro (-3 / +3 lines)
14	win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib	14	win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
15	win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib	15	win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
16	macx:LIBS += ../../external/lib/macx/libmuparser.a	16	macx:LIBS += ../../external/lib/macx/libmuparser.a
17	linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a	17	+linux-g++:LIBS += -lmuparser
18	linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a	18	+linux-g++-32:LIBS += -lmuparser
19	linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a	19	+linux-g++-64:LIBS += -lmuparser
20	win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a	20	win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a




SOURCES       += filter_qhull.cpp \ 
		qhull_tools.cpp 

HEADERS += 	/usr/include/qhull/geom.h \
		/usr/include/qhull/io.h \
		/usr/include/qhull/mem.h \
		/usr/include/qhull/merge.h \
		/usr/include/qhull/poly.h \
		/usr/include/qhull/qhull.h \
		/usr/include/qhull/qset.h \
		/usr/include/qhull/stat.h \
		/usr/include/qhull/user.h 

TARGET        = filter_qhull
		../../external/qhull-2003.1/src/geom2.c \
		../../external/qhull-2003.1/src/global.c \
		../../external/qhull-2003.1/src/io.c \
		../../external/qhull-2003.1/src/mem.c \
		../../external/qhull-2003.1/src/merge.c \
		../../external/qhull-2003.1/src/poly.c \
		../../external/qhull-2003.1/src/poly2.c \
		../../external/qhull-2003.1/src/qconvex.c \
		../../external/qhull-2003.1/src/qhull.c \
		../../external/qhull-2003.1/src/qset.c \
		../../external/qhull-2003.1/src/stat.c \
		../../external/qhull-2003.1/src/user.c 

TARGET        = filter_qhull




#endif
#include <stdio.h>
#include <stdlib.h>
#include "qhull/qhull.h"
#include "qhull/mem.h"
#include "qhull/qset.h"
#include "qhull/geom.h"
#include "qhull/merge.h"
#include "qhull/poly.h"
#include "qhull/io.h"
#include "qhull/stat.h"
#if defined(__cplusplus)
}
#endif

facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);
bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);
bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);
int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);




VCGDIR = ../../../vcglib
GLEWDIR = /usr/include/GL
#CONFIG += debug_and_release
DESTDIR = ../distrib


# CONFIG += warn_off
INCLUDEPATH *= ../.. \
    $$VCGDIR \
    $$GLEWDIR
DEPENDPATH += $$VCGDIR \
    $$VCGDIR/vcg \
    $$VCGDIR/wrap

INCLUDEPATH += . \
    .. \
    ../../../vcglib \
    $$GLEWDIR
CONFIG += stl

macx:LIBS += ../common/libcommon.dylib

#	win32-g++:release:LIBS 			+= -L../common/release -lcommon
#}

linux-g++:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
linux-g++-32:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
linux-g++-32:QMAKE_RPATHDIR += ../usr/lib/meshlab
linux-g++-64:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab


# uncomment in your local copy only in emergency cases.




				
TARGET        = filter_isoparametrization
INCLUDEPATH  += ./  \
                /usr/include/levmar/

win32-msvc2005:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP
win32-msvc2008:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP

win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/levmar.lib
win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/levmar.lib
win32-g++:LIBS		+= -L../../external/lib/win32-gcc -llevmar
linux-g++:LIBS		+= -llevmar
linux-g++-32:LIBS	+= -llevmar
linux-g++-64:LIBS	+= -llevmar

macx:LIBS += ../../../src/external/lib/macx/liblevmar.a

# Please never ever uncomment this...





TARGET        = io_3ds

INCLUDEPATH += /usr/include/lib3ds/

# Notes on the paths of lib3ds files.
# Once you have compiled the library put the lib files in a dir named lib/XXX/ 

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 += -l3ds
linux-g++-32:LIBS += -l3ds
linux-g++-64:LIBS += -l3ds

# unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds





win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib
win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
linux-g++:LIBS	+= -lbz2
linux-g++-32:LIBS	+= -lbz2
linux-g++-64:LIBS	+= -lbz2

win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5
#linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
#linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
#linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5

mac:LIBS   += -lbz2





GLEWDIR = /usr/include/GL

HEADERS        = 


win32-msvc2008:  LIBS += -L../distrib -lcommon
win32-msvc2010:  LIBS += -L../distrib -lcommon
win32-g++:  LIBS += -L../distrib -lcommon
linux-g++:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
linux-g++-32:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
linux-g++-32:QMAKE_RPATHDIR += /usr/lib/meshlab
linux-g++-64:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab
#CONFIG (release,debug | release) {
#	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
#	win32-msvc2008:release:  LIBS += -L../common/release -lcommon


#DEFINES += GLEW_STATIC

INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR
CONFIG += stl 
CONFIG += console





QT += script

VCGDIR  = ../../../../vcglib
GLEWDIR = /usr/include/GL

mac:LIBS += ../../common/libcommon.dylib


win32-msvc2005:  LIBS += ../../distrib/common.lib
win32-msvc2008:  LIBS += ../../distrib/common.lib
win32-g++:LIBS += -L../../distrib -lcommon
linux-g++:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
linux-g++-32:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
linux-g++-64:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW

#CONFIG(debug, debug|release) {
#	win32-msvc2005:  LIBS += ../../common/debug/common.lib

Return to bug 208359

Lines 55-68 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/qhull_tools.h (-9 / +9 lines)
55	#endif	55	#endif
56	#include <stdio.h>	56	#include <stdio.h>
57	#include <stdlib.h>	57	#include <stdlib.h>
58	#include "../../external/qhull-2003.1/src/qhull.h"	58	#include "qhull/qhull.h"
59	#include "../../external/qhull-2003.1/src/mem.h"	59	#include "qhull/mem.h"
60	#include "../../external/qhull-2003.1/src/qset.h"	60	#include "qhull/qset.h"
61	#include "../../external/qhull-2003.1/src/geom.h"	61	#include "qhull/geom.h"
62	#include "../../external/qhull-2003.1/src/merge.h"	62	#include "qhull/merge.h"
63	#include "../../external/qhull-2003.1/src/poly.h"	63	#include "qhull/poly.h"
64	#include "../../external/qhull-2003.1/src/io.h"	64	#include "qhull/io.h"
65	#include "../../external/qhull-2003.1/src/stat.h"	65	#include "qhull/stat.h"
66	#if defined(__cplusplus)	66	#if defined(__cplusplus)
67	}	67	}
68	#endif	68	#endif
Lines 71-74 Link Here
71	facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);	71	facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);
72	bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);	72	bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);
73	bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);	73	bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);
74	int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);	74	int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);

Lines 24-30 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro (-4 / +5 lines)
24		24
25	TARGET = filter_isoparametrization	25	TARGET = filter_isoparametrization
26	INCLUDEPATH += ./ \	26	INCLUDEPATH += ./ \
27	../../external/levmar-2.3/	27	/usr/include/levmar/
28		28
29	win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP	29	win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
30	win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP	30	win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
Lines 41-49 Link Here
41	win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib	41	win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib
42	win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib	42	win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib
43	win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar	43	win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
44	linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar	44	linux-g++:LIBS += -llevmar
45	linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar	45	linux-g++-32:LIBS += -llevmar
46	linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar	46	linux-g++-64:LIBS += -llevmar
		47
47	macx:LIBS += ../../../src/external/lib/macx/liblevmar.a	48	macx:LIBS += ../../../src/external/lib/macx/liblevmar.a
48		49
49	# Please never ever uncomment this...	50	# Please never ever uncomment this...

Lines 8-35 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/filter_qhull.pro (-24 / +10 lines)
8	SOURCES += filter_qhull.cpp \	8	SOURCES += filter_qhull.cpp \
9	qhull_tools.cpp	9	qhull_tools.cpp
10		10
11	HEADERS += ../../external/qhull-2003.1/src/geom.h \	11	HEADERS += /usr/include/qhull/geom.h \
12	../../external/qhull-2003.1/src/io.h \	12	/usr/include/qhull/io.h \
13	../../external/qhull-2003.1/src/mem.h \	13	/usr/include/qhull/mem.h \
14	../../external/qhull-2003.1/src/merge.h \	14	/usr/include/qhull/merge.h \
15	../../external/qhull-2003.1/src/poly.h \	15	/usr/include/qhull/poly.h \
16	../../external/qhull-2003.1/src/qhull.h \	16	/usr/include/qhull/qhull.h \
17	../../external/qhull-2003.1/src/qset.h \	17	/usr/include/qhull/qset.h \
18	../../external/qhull-2003.1/src/stat.h \	18	/usr/include/qhull/stat.h \
19	../../external/qhull-2003.1/src/user.h	19	/usr/include/qhull/user.h
20		20
21	SOURCES += ../../external/qhull-2003.1/src/geom.c \	21	TARGET = filter_qhull
22	../../external/qhull-2003.1/src/geom2.c \
23	../../external/qhull-2003.1/src/global.c \
24	../../external/qhull-2003.1/src/io.c \
25	../../external/qhull-2003.1/src/mem.c \
26	../../external/qhull-2003.1/src/merge.c \
27	../../external/qhull-2003.1/src/poly.c \
28	../../external/qhull-2003.1/src/poly2.c \
29	../../external/qhull-2003.1/src/qconvex.c \
30	../../external/qhull-2003.1/src/qhull.c \
31	../../external/qhull-2003.1/src/qset.c \
32	../../external/qhull-2003.1/src/stat.c \
33	../../external/qhull-2003.1/src/user.c
34
35	TARGET = filter_qhull

Lines 14-20 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro (-4 / +4 lines)
14		14
15	TARGET = io_3ds	15	TARGET = io_3ds
16		16
17	INCLUDEPATH += ../../external/lib3ds-1.3.0/	17	INCLUDEPATH += /usr/include/lib3ds/
18		18
19	# Notes on the paths of lib3ds files.	19	# Notes on the paths of lib3ds files.
20	# Once you have compiled the library put the lib files in a dir named lib/XXX/	20	# Once you have compiled the library put the lib files in a dir named lib/XXX/
Lines 25-33 Link Here
25	win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib	25	win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib
26	win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib	26	win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib
27	win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a	27	win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a
28	linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a	28	linux-g++:LIBS += -l3ds
29	linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a	29	linux-g++-32:LIBS += -l3ds
30	linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a	30	linux-g++-64:LIBS += -l3ds
31		31
32	# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds	32	# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
33		33

Lines 8-14 Link Here

(-)MeshLabSrc_AllInc_v130a/meshlab/src/shared.pri (-4 / +4 lines)
8	QT += script	8	QT += script
9		9
10	VCGDIR = ../../../../vcglib	10	VCGDIR = ../../../../vcglib
11	GLEWDIR = ../../external/glew-1.5.1	11	GLEWDIR = /usr/include/GL
12		12
13	mac:LIBS += ../../common/libcommon.dylib	13	mac:LIBS += ../../common/libcommon.dylib
14		14
Lines 17-25 Link Here
17	win32-msvc2005: LIBS += ../../distrib/common.lib	17	win32-msvc2005: LIBS += ../../distrib/common.lib
18	win32-msvc2008: LIBS += ../../distrib/common.lib	18	win32-msvc2008: LIBS += ../../distrib/common.lib
19	win32-g++:LIBS += -L../../distrib -lcommon	19	win32-g++:LIBS += -L../../distrib -lcommon
20	linux-g++:LIBS += -L../../distrib -lcommon	20	linux-g++:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
21	linux-g++-32:LIBS += -L../../distrib -lcommon	21	linux-g++-32:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
22	linux-g++-64:LIBS += -L../../distrib -lcommon	22	linux-g++-64:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
23		23
24	#CONFIG(debug, debug\|release) {	24	#CONFIG(debug, debug\|release) {
25	# win32-msvc2005: LIBS += ../../common/debug/common.lib	25	# win32-msvc2005: LIBS += ../../common/debug/common.lib