blob: 28ea7d3ec546440e78268b856eea7ba34bd2d4ff (
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
33
34
35
36
37
38
39
40
41
42
43
44
|
diff --git a/src/external/external.pro b/src/external/external.pro
index 7bd97f60..93ed196b 100644
--- a/src/external/external.pro
+++ b/src/external/external.pro
@@ -2,11 +2,6 @@ config += debug_and_release
TEMPLATE = subdirs
-SUBDIRS = bzip2-1.0.5/bzip2-1.0.5.pro \
- muparser_v225/src \
- levmar-2.3/levmar-2.3.pro \
- structuresynth-1.5/structuresynth.pro \
+SUBDIRS = structuresynth-1.5/structuresynth.pro \
OpenCTM-1.0.3/openctm.pro \
- jhead-2.95/jhead-2.95.pro \
- lib3ds-1.3.0/lib3ds/lib3ds.pro
-# openkinect/openkinect.pro
+ jhead-2.95/jhead-2.95.pro
diff --git a/src/external/ext_common.pri b/src/external/ext_common.pri
index 878e9cdc..387fe3ce 100644
--- a/src/external/ext_common.pri
+++ b/src/external/ext_common.pri
@@ -12,7 +12,7 @@ win32-msvc2015:DEFINES += _CRT_SECURE_NO_WARNINGS
win32-msvc2017:DEFINES += _CRT_SECURE_NO_WARNINGS
win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
-linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux
+linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++
unix:CONFIG(release, debug|release) {
DEFINES *= NDEBUG
diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
index cae4cb4f..a3fbcdc3 100644
--- a/src/meshlab/meshlab.pro
+++ b/src/meshlab/meshlab.pro
@@ -154,7 +154,7 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
# win32-g++:release:LIBS += -L../common/release -lcommon
#}
-linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU
+linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
linux:QMAKE_RPATHDIR += ../distrib
# uncomment in your local copy only in emergency cases.
|