Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <deathbaba@gmail.com>2013-03-21 10:06:43 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:51:54 +0300
commit0ae8e4b9e093bc858ad17ca8907d8ff65322b541 (patch)
tree39f985dc1b98c0cc52f280605742035a0b8ed404 /common.pri
parent472367e8888fc2fb2dc69b9ac17319f81f62dce5 (diff)
[android] Fixed production build compiler keys
Diffstat (limited to 'common.pri')
-rw-r--r--common.pri15
1 files changed, 9 insertions, 6 deletions
diff --git a/common.pri b/common.pri
index f102ab594f..74400828e8 100644
--- a/common.pri
+++ b/common.pri
@@ -112,6 +112,7 @@ win32-msvc2010 {
QMAKE_LIB += /LTCG
}
+# unix also works for Android
unix|win32-g++ {
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare -Wno-strict-aliasing -Wno-unused-parameter \
-Werror=return-type
@@ -126,12 +127,6 @@ unix|win32-g++ {
QMAKE_CFLAGS_RELEASE *= -ffast-math
QMAKE_CXXFLAGS_RELEASE *= -ffast-math
- # debian build requirements
- CONFIG(production) {
- QMAKE_CFLAGS_RELEASE = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
- QMAKE_CXXFLAGS_RELEASE = -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
- QMAKE_LFLAGS = -Wl,-z,relro
- }
}
linux-g++* {
@@ -143,6 +138,14 @@ linux-g++* {
QMAKE_LFLAGS *= -Wl,--gc-sections
QMAKE_CFLAGS_RELEASE *= -ffloat-store
QMAKE_CXXFLAGS_RELEASE *= -ffloat-store
+
+ # debian build requirements
+ CONFIG(production) {
+ QMAKE_CFLAGS_RELEASE = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
+ QMAKE_CXXFLAGS_RELEASE = -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
+ QMAKE_LFLAGS = -Wl,-z,relro
+ }
+
}
android-g++ {