blob: 1b064f7f6ae99690f6b6ec500dcc69818aa312ee (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From: Teemu Ikonen <tpikonen@gmail.com>
Subject: Use Debian libbz2.
Git-Branch: p/libbz2
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..a6e1a0b242a02075c0d686ec4fa8b8
meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
index e317b99..94dc124 100644
--- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
@@ -32,16 +32,12 @@ RESOURCES = edit_arc3D.qrc
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a
-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a
+linux-g++:LIBS += -lbz2
win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5
-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5
+linux-g++:INCLUDEPATH += /usr/include
mac:LIBS += -lbz2
|
GitWeb
