aboutsummaryrefslogtreecommitdiff
blob: 243ed1d9668a045b7c8227e149668570a9db8d9a (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
32
From: Teemu Ikonen <tpikonen@gmail.com>
Subject: Use Debian lib3ds.
Git-Branch: p/lib3ds
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..944ece3e566dbf4cc885163178d303

 meshlab/src/meshlabplugins/io_3ds/io_3ds.pro |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
index cf8052a..fed064d 100644
--- a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
+++ b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
@@ -14,7 +14,7 @@ SOURCES       += 	meshio.cpp \
 
 TARGET        = io_3ds
 
-INCLUDEPATH += ../../external/lib3ds-1.3.0/
+INCLUDEPATH += /usr/include/lib3ds
 
 # Notes on the paths of lib3ds files.
 # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
@@ -25,9 +25,7 @@ win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/3ds.lib
 win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
 win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
 win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
+linux-g++:LIBS += -l3ds
 
 # unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds