diff options
Diffstat (limited to 'media-gfx/meshlab/files/9999-use-external-libs.patch')
| -rw-r--r-- | media-gfx/meshlab/files/9999-use-external-libs.patch | 61 |
1 files changed, 23 insertions, 38 deletions
diff --git a/media-gfx/meshlab/files/9999-use-external-libs.patch b/media-gfx/meshlab/files/9999-use-external-libs.patch index 2a39451d4..8dd5a3cb1 100644 --- a/media-gfx/meshlab/files/9999-use-external-libs.patch +++ b/media-gfx/meshlab/files/9999-use-external-libs.patch @@ -1,5 +1,5 @@ diff --git a/common/common.pro b/common/common.pro -index dc89adeb..3d9404b3 100644 +index cf4cccff..e75f1bb4 100644 --- a/common/common.pro +++ b/common/common.pro @@ -1,7 +1,4 @@ @@ -10,26 +10,23 @@ index dc89adeb..3d9404b3 100644 win32-msvc2005:DESTDIR = ../distrib win32-msvc2008:DESTDIR = ../distrib -@@ -56,8 +53,7 @@ fi;\ - " +@@ -44,7 +41,6 @@ fi;\ INCLUDEPATH *= ../.. \ $$VCGDIR \ -- $$EIGENDIR \ -- $$GLEWDIR/include -+ $$EIGENDIR + $$EIGENDIR \ +- $$GLEWDIR/include \ + $$EXIF_DIR TEMPLATE = lib - linux-g++:CONFIG += dll - linux-g++:DESTDIR = ../distrib -@@ -84,8 +80,6 @@ QT += script + +@@ -69,7 +65,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 \ + + win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS + +@@ -102,7 +97,6 @@ SOURCES += filterparameter.cpp \ mlapplication.cpp \ scriptsyntax.cpp \ searcher.cpp \ @@ -38,19 +35,19 @@ index dc89adeb..3d9404b3 100644 meshlabdocumentbundler.cpp \ ml_shared_data_context.cpp diff --git a/general.pri b/general.pri -index fa9dcdc8..57352f4e 100644 +index d12a066e..be41ffce 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 +-GLEWDIR = ../external/glew-2.1.0 CONFIG += c++11 diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro -index 2661143f..0df2cd77 100644 +index efaa6614..b9e5d321 100644 --- a/meshlab/meshlab.pro +++ b/meshlab/meshlab.pro @@ -1,7 +1,6 @@ @@ -72,19 +69,13 @@ index 2661143f..0df2cd77 100644 DEPENDPATH += $$VCGDIR \ $$VCGDIR/vcg \ $$VCGDIR/wrap -@@ -154,11 +151,11 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom +@@ -154,7 +151,7 @@ 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 +-linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU ++linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU -lGLEW + linux: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 @@ -155,21 +146,15 @@ index fc060de0..59528e0c 100644 #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 +index e97962a1..058e2512 100644 --- a/meshlabserver/meshlabserver.pro +++ b/meshlabserver/meshlabserver.pro -@@ -29,11 +29,11 @@ win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 +@@ -29,7 +29,7 @@ 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 +-linux: LIBS += -L../distrib -lcommon ++linux: LIBS += -L../distrib -lcommon -lGLEW + linux:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon |