From: Teemu Ikonen Subject: Use Debian GLEW. X-git-branch: p/glew meshlab/src/common/common.pro | 8 ++++---- meshlab/src/meshlab/meshlab.pro | 7 ++----- meshlab/src/meshlabplugins/filter_plymc/plymc.pro | 2 +- meshlab/src/meshlabserver/meshlabserver.pro | 6 ++---- meshlab/src/shared.pri | 11 ++++++----- vcglib/apps/sample/trimesh_QT/trimesh_qt.pro | 5 +++-- .../sample/trimesh_pos_demo/trimesh_pos_demo.pro | 4 ++-- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/meshlab/src/common/common.pro b/meshlab/src/common/common.pro index d392f65..22ebb9d 100644 --- a/meshlab/src/common/common.pro +++ b/meshlab/src/common/common.pro @@ -1,7 +1,7 @@ VCGDIR = ../../../vcglib -GLEWDIR = ../external/glew-1.5.1 -GLEWCODE = $$GLEWDIR/src/glew.c - +GLEWDIR = /usr +#GLEWCODE = $$GLEWDIR/src/glew.c +LIBS += -lGLEW win32-msvc2005:DESTDIR = ../distrib win32-msvc2008:DESTDIR = ../distrib @@ -83,5 +83,5 @@ SOURCES += filterparameter.cpp \ scriptinterface.cpp \ mlparameter.cpp \ xmlfilterinfo.cpp \ - $$GLEWCODE \ +# $$GLEWCODE \ meshlabdocumentxml.cpp diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro index 8f286bb..551a1a7 100644 --- a/meshlab/src/meshlab/meshlab.pro +++ b/meshlab/src/meshlab/meshlab.pro @@ -1,5 +1,5 @@ VCGDIR = ../../../vcglib -GLEWDIR = ../external/glew-1.5.1 +GLEWDIR = /usr #CONFIG += debug_and_release DESTDIR = ../distrib @@ -128,14 +128,11 @@ win32-g++:LIBS += -L../distrib -lcommon # win32-g++:release:LIBS += -L../common/release -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 - # uncomment in your local copy only in emergency cases. # We should never be too permissive # win32-g++:QMAKE_CXXFLAGS += -fpermissive diff --git a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro index 8b4a30f..472f167 100755 --- a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro +++ b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro @@ -2,7 +2,7 @@ TARGET = plymc LIBPATH += DEPENDPATH += . INCLUDEPATH += ../../../../vcglib \ - ../../code/lib/glew/include + /usr/include CONFIG += console \ stl \ debug_and_release diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro index cca5560..9b070c7 100644 --- a/meshlab/src/meshlabserver/meshlabserver.pro +++ b/meshlab/src/meshlabserver/meshlabserver.pro @@ -1,4 +1,4 @@ -GLEWDIR = ../external/glew-1.5.1 +GLEWDIR = /usr HEADERS = @@ -25,11 +25,9 @@ win32-msvc2005: LIBS += -L../distrib -lcommon 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 diff --git a/meshlab/src/shared.pri b/meshlab/src/shared.pri index be762cd..1eced9f 100644 --- a/meshlab/src/shared.pri +++ b/meshlab/src/shared.pri @@ -8,7 +8,7 @@ QT += xmlpatterns QT += script VCGDIR = ../../../../vcglib -GLEWDIR = ../../external/glew-1.5.1 +GLEWDIR = /usr mac:LIBS += ../../common/libcommon.dylib @@ -17,9 +17,10 @@ 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 -linux-g++-32:LIBS += -L../../distrib -lcommon -linux-g++-64:LIBS += -L../../distrib -lcommon +linux-g++:LIBS += -L../../distrib -lcommon -lGLEW +#linux-g++-32:LIBS += -L../../distrib -lcommon +#linux-g++-64:LIBS += -L../../distrib -lcommon + #CONFIG(debug, debug|release) { # win32-msvc2005: LIBS += ../../common/debug/common.lib @@ -73,4 +74,4 @@ contains(TEMPLATE,lib) { win32-msvc2005: RCC_DIR = $(ConfigurationName) - win32-msvc2008: RCC_DIR = $(ConfigurationName) \ No newline at end of file + win32-msvc2008: RCC_DIR = $(ConfigurationName) diff --git a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro index 8a3c7fc..986116e 100644 --- a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro +++ b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro @@ -26,8 +26,9 @@ SOURCES += ../../../wrap/gui/trackmode.cpp # Compile glew DEFINES += GLEW_STATIC -INCLUDEPATH += ../../../../code/lib/glew/include -SOURCES += ../../../../code/lib/glew/src/glew.c +INCLUDEPATH += /usr/include +#SOURCES += ../../../../code/lib/glew/src/glew.c +LIBS += -lGLEW # Awful problem with windows.. win32{ diff --git a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro index e8ae178..4a69fef 100644 --- a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro +++ b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro @@ -1,14 +1,14 @@ -INCLUDEPATH += . ../../.. ../../../../code/lib ../../../../code/lib/glew/include +INCLUDEPATH += . ../../.. ../../../../code/lib /usr/include HEADERS = glwidget.h \ window.h \ mesh_type.h SOURCES = glwidget.cpp \ main.cpp \ window.cpp\ - ../../../../code/lib/glew/src/glew.c \ ../../../wrap/ply/plylib.cpp\ ../../../wrap/gui/trackmode.cpp\ ../../../wrap/gui/trackball.cpp +LIBS += -lGLEW QT += opengl # install