diff options
Diffstat (limited to 'rpath.patch')
| -rw-r--r-- | rpath.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/rpath.patch b/rpath.patch deleted file mode 100644 index b5ce59f57422..000000000000 --- a/rpath.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro -index cae4cb4f..6b1e3466 100644 ---- a/src/meshlab/meshlab.pro -+++ b/src/meshlab/meshlab.pro -@@ -155,7 +155,7 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom - #} - - linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU --linux:QMAKE_RPATHDIR += ../distrib -+linux:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive -diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro -index e97962a1..0436a55c 100644 ---- a/src/meshlabserver/meshlabserver.pro -+++ b/src/meshlabserver/meshlabserver.pro -@@ -30,7 +30,7 @@ win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-g++: LIBS += -L../distrib -lcommon - linux: LIBS += -L../distrib -lcommon --linux:QMAKE_RPATHDIR += ../distrib -+linux:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon |