diff options
Diffstat (limited to 'mpir.patch')
| -rw-r--r-- | mpir.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/mpir.patch b/mpir.patch index 9a318daf0172..9e0829b6942c 100644 --- a/mpir.patch +++ b/mpir.patch @@ -1,11 +1,16 @@ -diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro ---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 02:59:31.000000000 +1100 -+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2015-08-26 11:48:18.782952141 +1000 -@@ -18,6 +18,5 @@ - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib +diff --git a/src/meshlabplugins/filter_csg/filter_csg.pro b/src/meshlabplugins/filter_csg/filter_csg.pro +index 52147b1..f41385d 100644 +--- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro ++++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro +@@ -20,7 +20,7 @@ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../exte win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib + win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib -linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 -linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a -+linux-g++:LIBS += -lmpirxx -lmpir - +-linux-g++-64:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmpirxx.a ../../external/lib/linux-g++-64/libmpir.a ++unix:LIBS += -lmpirxx -lmpir ++linux-g++-:LIBS += -lmpirxx -lmpir ++linux-g++-32:LIBS += -lmpirxx -lmpir ++linux-g++-64:LIBS += -lmpirxx -lmpir |