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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From 420cf9b916449708204dc3733459517b7d7bdd7a Mon Sep 17 00:00:00 2001
From: Daigo Moriwaki <daigo@debian.org>
Date: Sun, 4 Dec 2016 22:29:16 +0900
Subject: Customize qmake files
---
lib/gui/gui.pro | 1 +
qt-common-local.pro | 7 +++++++
qt-common.pro | 13 ++++++-------
3 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 qt-common-local.pro
diff --git a/lib/gui/gui.pro b/lib/gui/gui.pro
index 05c79fb..67e41c3 100644
--- a/lib/gui/gui.pro
+++ b/lib/gui/gui.pro
@@ -1,4 +1,5 @@
TEMPLATE = lib
+QT += widgets
CONFIG -= moc
CONFIG += thread
CONFIG += staticlib
diff --git a/qt-common-local.pro b/qt-common-local.pro
new file mode 100644
index 0000000..60d4e84
--- /dev/null
+++ b/qt-common-local.pro
@@ -0,0 +1,7 @@
+# for mp
+DEFINES += OSL_SMP
+
+# use specific g++ command
+QMAKE_CXX = g++
+QMAKE_GXX = g++
+QMAKE_LINK = g++
diff --git a/qt-common.pro b/qt-common.pro
index b2de11a..359022a 100644
--- a/qt-common.pro
+++ b/qt-common.pro
@@ -1,5 +1,4 @@
-CONFIG += c++11
-QMAKE_CXXFLAGS += -std=c++11 -DOSL_SMP -fno-strict-aliasing -march=native
+QMAKE_CXXFLAGS += -DOSL_SMP -fno-strict-aliasing
macx {
MAKE_MACOSX_DEPLOYMENT_TARGET=10.9
@@ -18,11 +17,11 @@ isEmpty(OSL_HOME_QT) {
contains(TEMPLATE, app) {
OSL_LIB *= lib
equals(OSL_LIB, lib) {
- QMAKE_LIBDIR += $$OSL_HOME_QT/full/osl $$OSL_HOME_QT/std/osl $$OSL_HOME_QT/core/osl
- LIBS += -losl_full -losl_std -losl_core -lboost_filesystem$$BOOST_POSTFIX -lboost_serialization$$BOOST_POSTFIX -lboost_iostreams$$BOOST_POSTFIX
+ #QMAKE_LIBDIR += $$OSL_HOME_QT/full/osl $$OSL_HOME_QT/std/osl $$OSL_HOME_QT/core/osl
+ LIBS += -losl -lboost_filesystem$$BOOST_POSTFIX -lboost_serialization$$BOOST_POSTFIX -lboost_iostreams$$BOOST_POSTFIX
} else {
- QMAKE_LIBDIR += $$OSL_HOME_QT/full/osl $$OSL_HOME_QT/std/osl $$OSL_HOME_QT/core/osl
- LIBS += -losl_full -losl_std -losl_core -lboost_filesystem$$BOOST_POSTFIX -lboost_serialization$$BOOST_POSTFIX -lboost_iostreams$$BOOST_POSTFIX
+ #QMAKE_LIBDIR += $$OSL_HOME_QT/full/osl $$OSL_HOME_QT/std/osl $$OSL_HOME_QT/core/osl
+ LIBS += -losl -lboost_filesystem$$BOOST_POSTFIX -lboost_serialization$$BOOST_POSTFIX -lboost_iostreams$$BOOST_POSTFIX
}
macx {
@@ -30,7 +29,7 @@ contains(TEMPLATE, app) {
}
}
-// OSL_MALLOC *= pool
+# OSL_MALLOC *= pool
isEmpty(TCMALLOC) {
TCMALLOC = google-perftools-1.7
}
--
2.20.1
|
