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 <alex@maps.me>2015-03-17 13:11:53 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:40:03 +0300
commite6502df585782a0ca9c1a4d749f3c3dc5ffd0c0a (patch)
tree0949f3e3d738cd5732e98868a913947a925e9d81 /common.pri
parent217de72ef7eba27f6d603e6ef0360aeaf7f59a1c (diff)
[mac] Removed outdated clang params which break compilation in some cases.
Diffstat (limited to 'common.pri')
-rw-r--r--common.pri14
1 files changed, 1 insertions, 13 deletions
diff --git a/common.pri b/common.pri
index bf69856499..1d6798cf06 100644
--- a/common.pri
+++ b/common.pri
@@ -18,7 +18,7 @@ VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}
# Additional include directories, common to most projects.
INCLUDEPATH *= $$ROOT_DIR/3party/boost
-INCLUDEPATH *= $$ROOT_DIR/3party/glm/
+INCLUDEPATH *= $$ROOT_DIR/3party/glm
# hack for Qt5 qmake to make it faster
CONFIG -= depend_includepath
@@ -178,18 +178,6 @@ win32-g++ {
}
macx-* {
- # minimum supported Mac OS X version
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
- QMAKE_CFLAGS *= -mmacosx-version-min=10.6
- QMAKE_CXXFLAGS *= -mmacosx-version-min=10.6
- # replace 10.5 with 10.6
- QMAKE_CFLAGS_X86_64 -= -mmacosx-version-min=10.5
- QMAKE_CXXFLAGS_X86_64 -= -mmacosx-version-min=10.5
- QMAKE_CFLAGS_X86_64 += -mmacosx-version-min=10.6 # CXX is made based on CFLAGS
- QMAKE_OBJECTIVE_CFLAGS_X86_64 -= -mmacosx-version-min=10.5
- QMAKE_OBJECTIVE_CFLAGS_X86_64 += -mmacosx-version-min=10.6
- QMAKE_LFLAGS_X86_64 -= -mmacosx-version-min=10.5
- QMAKE_LFLAGS_X86_64 += -mmacosx-version-min=10.6
QMAKE_LFLAGS *= -dead_strip
# macx-clang {