diff options
Diffstat (limited to 'cad/meshlab/files/patch-meshlabserver_meshlabserver.pro')
| -rw-r--r-- | cad/meshlab/files/patch-meshlabserver_meshlabserver.pro | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro b/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro index d5e2f9910ef7..789d856bc24f 100644 --- a/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro +++ b/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro @@ -1,21 +1,11 @@ ---- meshlabserver/meshlabserver.pro.bak 2011-01-25 08:49:46.000000000 +0100 -+++ meshlabserver/meshlabserver.pro 2012-06-21 09:29:05.000000000 +0200 -@@ -25,12 +25,12 @@ - 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++: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 -+freebsd-g++: LIBS += $$PWD/../distrib/libcommon.so -+freebsd-g++:QMAKE_RPATHDIR += ../distrib -+freebsd-g++-32: LIBS += $$PWD/../distrib/libcommon.so -+freebsd-g++-32:QMAKE_RPATHDIR += ../distrib -+freebsd-g++-64: LIBS += $$PWD/../distrib/libcommon.so -+freebsd-g++-64:QMAKE_RPATHDIR += ../distrib +--- meshlabserver/meshlabserver.pro.orig 2011-10-14 18:34:48.000000000 +0200 ++++ meshlabserver/meshlabserver.pro 2013-05-08 10:36:08.000000000 +0200 +@@ -31,6 +31,8 @@ + linux-g++-32:QMAKE_RPATHDIR += ../distrib + linux-g++-64: LIBS += -L../distrib -lcommon + linux-g++-64:QMAKE_RPATHDIR += ../distrib ++LIBS += -L../common -lcommon -L../external/jhead-2.95 -ljhead ++QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon # win32-msvc2008:release: LIBS += -L../common/release -lcommon |