blob: 002c2dc3bdf9858ab1c5e67a9be7b73e8e34a3c5 (
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
45
46
47
48
49
50
51
52
53
54
55
56
|
From 68d92b2de5d598d4d85e2cdbddec5219ba317796 Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
Date: Thu, 23 Nov 2017 01:21:10 +0330
Subject: [PATCH] use-external-jhead
---
common/common.pro | 4 ++--
meshlab/meshlab.pro | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/common.pro b/common/common.pro
index 51cdcb5..8bdf6a5 100644
--- a/common/common.pro
+++ b/common/common.pro
@@ -1,5 +1,5 @@
include (../general.pri)
-EXIF_DIR = ../external/jhead-2.95
+#EXIF_DIR = ../external/jhead-2.95
GLEWCODE = $$GLEWDIR/src/glew.c
@@ -79,7 +79,7 @@ QT += script
TARGET = common
DEPENDPATH += .
-INCLUDEPATH += . $$EXIF_DIR
+#INCLUDEPATH += . $$EXIF_DIR
DEFINES += GLEW_STATIC
win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
index 0e50581..5456342 100644
--- a/meshlab/meshlab.pro
+++ b/meshlab/meshlab.pro
@@ -1,7 +1,7 @@
include (../general.pri)
#CONFIG += debug_and_release
DESTDIR = ../distrib
-EXIF_DIR = ../external/jhead-2.95
+#EXIF_DIR = ../external/jhead-2.95
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
@@ -10,7 +10,8 @@ INCLUDEPATH *= . \
../.. \
$$VCGDIR \
$$GLEWDIR/include \
- $$EXIF_DIR
+# $$EXIF_DIR
+
DEPENDPATH += $$VCGDIR \
$$VCGDIR/vcg \
$$VCGDIR/wrap
--
2.15.0
|
