diff --git a/common/common.pro b/common/common.pro index dc89adeb..3d9404b3 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 @@ -56,8 +53,7 @@ fi;\ " INCLUDEPATH *= ../.. \ $$VCGDIR \ - $$EIGENDIR \ - $$GLEWDIR/include + $$EIGENDIR TEMPLATE = lib linux-g++:CONFIG += dll linux-g++:DESTDIR = ../distrib @@ -84,8 +80,6 @@ QT += script TARGET = common DEPENDPATH += . -INCLUDEPATH += . $$EXIF_DIR -DEFINES += GLEW_STATIC win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS @@ -123,7 +117,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 fa9dcdc8..57352f4e 100644 --- a/general.pri +++ b/general.pri @@ -7,7 +7,6 @@ DEFINES += MESHLAB_SCALAR=float VCGDIR = ../../../vcglib EIGENDIR = $$VCGDIR/eigenlib -GLEWDIR = ../external/glew-1.7.0 CONFIG += c++11 diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro index f6a1d7ee..90a7b449 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 @@ -153,11 +150,11 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom # win32-g++:release:LIBS += -L../common/release -lcommon #} -linux-g++:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU +linux-g++:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW linux-g++:QMAKE_RPATHDIR += ../distrib -linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU +linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW linux-g++-32:QMAKE_RPATHDIR += ../distrib -linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU +linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW linux-g++-64: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 14df20f1..ca9d6a2d 100644 --- a/meshlabplugins/filter_func/filter_func.pro +++ b/meshlabplugins/filter_func/filter_func.pro @@ -6,8 +6,6 @@ SOURCES += filter_func.cpp TARGET = filter_func -INCLUDEPATH += ../../external/muparser_v225/include - # Note: we need static libs so when building muparser lib use # ./configure --enable-shared=no @@ -20,7 +18,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..5ed78ab1 100644 --- a/meshlabplugins/io_3ds/io_3ds.pro +++ b/meshlabplugins/io_3ds/io_3ds.pro @@ -10,12 +10,8 @@ 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/ # where XXX is the name of your system according to the QT naming style. @@ -26,9 +22,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 4df0a6f0..78892c78 100644 --- a/meshlabserver/meshlabserver.pro +++ b/meshlabserver/meshlabserver.pro @@ -29,11 +29,11 @@ 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-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: LIBS += -L../distrib -lcommon -lGLEW linux-g++-32:QMAKE_RPATHDIR += ../distrib -linux-g++-64: LIBS += -L../distrib -lcommon +linux-g++-64: LIBS += -L../distrib -lcommon -lGLEW linux-g++-64:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon