diff -up meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib meshlab-1.3.1/meshlab/src/common/common.pro --- meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib 2011-09-14 04:42:54.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/common/common.pro 2011-10-21 11:47:40.281026085 -0600 @@ -1,7 +1,4 @@ VCGDIR = ../../../vcglib -GLEWDIR = ../external/glew-1.5.1 -GLEWCODE = $$GLEWDIR/src/glew.c - win32-msvc2005:DESTDIR = ../distrib win32-msvc2008:DESTDIR = ../distrib @@ -36,15 +33,10 @@ mkdir ../distrib/meshlab.app/Contents/Ma fi; \ cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/" INCLUDEPATH *= ../.. \ - $$VCGDIR \ - $$GLEWDIR/include + $$VCGDIR TEMPLATE = lib linux-g++:CONFIG += dll linux-g++:DESTDIR = ../distrib -linux-g++-32:CONFIG += dll -linux-g++-32:DESTDIR = ../distrib -linux-g++-64:CONFIG += dll -linux-g++-64:DESTDIR = ../distrib win32-msvc2005:CONFIG += staticlib win32-msvc2008:CONFIG += staticlib @@ -59,7 +51,6 @@ QT += script TARGET = DEPENDPATH += . INCLUDEPATH += . -DEFINES += GLEW_STATIC win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS @@ -86,7 +77,6 @@ SOURCES += filterparameter.cpp \ scriptinterface.cpp \ xmlfilterinfo.cpp \ mlapplication.cpp \ - $$GLEWCODE \ meshlabdocumentxml.cpp # win32-msvc2005: RCC_DIR = $(ConfigurationName) diff -up meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib meshlab-1.3.1/meshlab/src/external/external.pro --- meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib 2011-09-15 10:29:13.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/external/external.pro 2011-10-21 13:44:01.888567468 -0600 @@ -2,10 +2,5 @@ config += debug_and_release TEMPLATE = subdirs -SUBDIRS = lib3ds-1.3.0/lib3ds \ - bzip2-1.0.5/bzip2-1.0.5.pro \ - muparser_v132/src \ - levmar-2.3/levmar-2.3.pro \ - structuresynth/structuresynth.pro \ - OpenCTM-1.0.3/openctm.pro +SUBDIRS = structuresynth/structuresynth.pro \ # openkinect/openkinect.pro diff -up meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro --- meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib 2011-06-06 01:47:12.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro 2011-10-21 13:39:02.054507411 -0600 @@ -1,5 +1,4 @@ VCGDIR = ../../../vcglib -GLEWDIR = ../external/glew-1.5.1 #CONFIG += debug_and_release DESTDIR = ../distrib @@ -7,8 +6,7 @@ DESTDIR = ../distrib # DEFINES += VCG_USE_EIGEN # CONFIG += warn_off INCLUDEPATH *= ../.. \ - $$VCGDIR \ - $$GLEWDIR/include + $$VCGDIR DEPENDPATH += $$VCGDIR \ $$VCGDIR/vcg \ $$VCGDIR/wrap @@ -107,8 +105,7 @@ mac:QMAKE_CXX = g++-4.2 INCLUDEPATH += . \ .. \ - ../../../vcglib \ - $$GLEWDIR/include + ../../../vcglib CONFIG += stl macx:LIBS += ../common/libcommon.dylib @@ -128,12 +125,8 @@ win32-g++:LIBS += -L../distrib - # win32-g++:release:LIBS += -L../common/release -lcommon #} -linux-g++:LIBS += -L../distrib -lcommon +linux-g++:LIBS += -L../distrib -lcommon -lGLEW -lGLU linux-g++:QMAKE_RPATHDIR += ../distrib -linux-g++-32:LIBS += -L../distrib -lcommon -linux-g++-32:QMAKE_RPATHDIR += ../distrib -linux-g++-64:LIBS += -L../distrib -lcommon -linux-g++-64:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib 2011-06-06 01:47:26.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro 2011-10-21 11:47:40.282026049 -0600 @@ -6,15 +6,11 @@ SOURCES += filter_func.cpp TARGET = filter_func -INCLUDEPATH += ../../external/muparser_v132/include - # Note: we need static libs so when building muparser lib use # ./configure --enable-shared=no win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib macx:LIBS += ../../external/lib/macx/libmuparser.a -linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a -linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a +linux-g++:LIBS += -lmuparser win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2011-06-06 01:47:26.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-10-21 11:47:40.282026049 -0600 @@ -23,8 +23,7 @@ HEADERS += ./diamond_sampler.h \ SOURCES += ./filter_isoparametrization.cpp TARGET = filter_isoparametrization -INCLUDEPATH += ./ \ - ../../external/levmar-2.3/ +INCLUDEPATH += ./ win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP @@ -41,9 +40,7 @@ win32-msvc.net:LIBS += ../../external/li 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 += -L../../external/lib/linux-g++ -llevmar -linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar -linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar +linux-g++:LIBS += -llevmar macx:LIBS += ../../../src/external/lib/macx/liblevmar.a # Please never ever uncomment this... diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2011-06-23 01:25:10.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2011-10-21 11:47:40.283026013 -0600 @@ -14,7 +14,7 @@ #include <local_parametrization.h> #include <mesh_operators.h> -#include <lm.h> +#include <levmar.h> #include <uv_grid.h> #include "opt_patch.h" diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2011-06-23 01:25:10.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2011-10-21 11:47:40.284025977 -0600 @@ -34,7 +34,7 @@ #include <vcg/space/color4.h> #include <dual_coord_optimization.h> #include <float.h> -#include <lm.h> +#include <levmar.h> #ifndef _MESHLAB #include <wrap/io_trimesh/export_ply.h> #endif diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib 2011-06-06 01:47:13.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro 2011-10-21 11:47:40.284025977 -0600 @@ -1,17 +1,15 @@ include (../../shared.pri) -QTSOAPDIR = ../../external/qtsoap-2.7_1/src - -INCLUDEPATH += $$QTSOAPDIR +INCLUDEPATH += /usr/include/QtSoap HEADERS += filter_photosynth.h \ - synthData.h \ - $$QTSOAPDIR/qtsoap.h + synthData.h SOURCES += filter_photosynth.cpp \ - downloader.cpp \ - $$QTSOAPDIR/qtsoap.cpp + downloader.cpp TARGET = filter_photosynth +linux-g++:LIBS += -lqtsoap + QT += network diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib 2011-06-06 01:47:14.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2011-10-21 11:47:40.285025940 -0600 @@ -8,28 +8,8 @@ HEADERS += filter_qhull.h \ SOURCES += filter_qhull.cpp \ qhull_tools.cpp -HEADERS += ../../external/qhull-2003.1/src/geom.h \ - ../../external/qhull-2003.1/src/io.h \ - ../../external/qhull-2003.1/src/mem.h \ - ../../external/qhull-2003.1/src/merge.h \ - ../../external/qhull-2003.1/src/poly.h \ - ../../external/qhull-2003.1/src/qhull.h \ - ../../external/qhull-2003.1/src/qset.h \ - ../../external/qhull-2003.1/src/stat.h \ - ../../external/qhull-2003.1/src/user.h +INCLUDEPATH += /usr/include/qhull -SOURCES += ../../external/qhull-2003.1/src/geom.c \ - ../../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 +LIBS += -lqhull -TARGET = filter_qhull \ No newline at end of file +TARGET = filter_qhull diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h --- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib 2011-06-06 01:47:14.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2011-10-21 11:47:40.285025940 -0600 @@ -55,14 +55,14 @@ extern "C" #endif #include <stdio.h> #include <stdlib.h> -#include "../../external/qhull-2003.1/src/qhull.h" -#include "../../external/qhull-2003.1/src/mem.h" -#include "../../external/qhull-2003.1/src/qset.h" -#include "../../external/qhull-2003.1/src/geom.h" -#include "../../external/qhull-2003.1/src/merge.h" -#include "../../external/qhull-2003.1/src/poly.h" -#include "../../external/qhull-2003.1/src/io.h" -#include "../../external/qhull-2003.1/src/stat.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 diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro --- meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2011-06-06 01:47:19.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-10-21 11:47:40.286025903 -0600 @@ -14,7 +14,7 @@ SOURCES += meshio.cpp \ TARGET = io_3ds -INCLUDEPATH += ../../external/lib3ds-1.3.0/ +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/ @@ -25,9 +25,7 @@ win32-msvc.net:LIBS += ../../external/li 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 += ../../external/lib/linux-g++/lib3ds.a -linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a +linux-g++:LIBS += -l3ds # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro --- meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib 2011-06-06 01:47:23.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-10-21 11:47:40.286025903 -0600 @@ -30,16 +30,11 @@ QT += xml 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 += ../../external/lib/linux-g++/libbz2.a -linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a +linux-g++: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 diff -up meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro --- meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-06-06 01:47:03.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro 2011-10-21 11:47:40.287025867 -0600 @@ -1,5 +1,3 @@ -GLEWDIR = ../external/glew-1.5.1 - HEADERS = SOURCES = mainserver.cpp @@ -25,12 +23,8 @@ win32-msvc2005: LIBS += -L../distrib -l win32-msvc2008: LIBS += -L../distrib -lcommon win32-msvc2010: LIBS += -L../distrib -lcommon win32-g++: LIBS += -L../distrib -lcommon -linux-g++: LIBS += -L../distrib -lcommon +linux-g++: LIBS += -L../distrib -lcommon -lGLEW linux-g++:QMAKE_RPATHDIR += ../distrib -linux-g++-32: LIBS += -L../distrib -lcommon -linux-g++-32:QMAKE_RPATHDIR += ../distrib -linux-g++-64: LIBS += -L../distrib -lcommon -linux-g++-64:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon # win32-msvc2008:release: LIBS += -L../common/release -lcommon @@ -43,7 +37,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC #DEFINES += GLEW_STATIC -INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include +INCLUDEPATH += . .. ../../../vcglib CONFIG += stl CONFIG += console diff -up meshlab-1.3.1/meshlab/src/shared.pri.sharedlib meshlab-1.3.1/meshlab/src/shared.pri --- meshlab-1.3.1/meshlab/src/shared.pri.sharedlib 2011-06-06 01:47:27.000000000 -0600 +++ meshlab-1.3.1/meshlab/src/shared.pri 2011-10-21 11:47:40.287025867 -0600 @@ -8,7 +8,6 @@ QT += xmlpatterns QT += script VCGDIR = ../../../../vcglib -GLEWDIR = ../../external/glew-1.5.1 mac:LIBS += ../../common/libcommon.dylib @@ -36,7 +35,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC # DEFINES += VCG_USE_EIGEN # CONFIG += warn_off -INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include +INCLUDEPATH *= ../.. $$VCGDIR /usr/include/GLEW DEPENDPATH += $$VCGDIR # Uncomment these if you want to experiment with newer gcc compilers