diff options
| author | Alex Zolotarev <alex@maps.me> | 2015-08-18 21:20:45 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:01:40 +0300 |
| commit | d9b24528b9983c781c72c27d4ed58dc134a501ab (patch) | |
| tree | 7aa1500ac4e0058de8fc1ae0643e156f60e9c475 /common.pri | |
| parent | 0f3435969405a43ec9c60da9f2a9d63e0540cfb4 (diff) | |
Rearranged library dependencies.
Diffstat (limited to 'common.pri')
| -rw-r--r-- | common.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common.pri b/common.pri index f9c4338816..bd630901f9 100644 --- a/common.pri +++ b/common.pri @@ -67,7 +67,7 @@ QMAKE_LIBDIR *= $$BINARIES_PATH QT -= core gui # Libraries' dependencies hack. -win32-msvc*|symbian { +win32-msvc* { LIB_EXT = .lib LIB_PREFIX = } @@ -82,8 +82,6 @@ for(project, DEPENDENCIES) { LIBS += -l$$project } -unix : LIBS *= -lz - #INCLUDEPATH += $$ROOT_DIR/3party/protobuf/src/ # Windows-specific options for all projects @@ -93,6 +91,7 @@ win32 { DEFINES += _WIN32_IE=0x0501 DEFINES += WIN32_LEAN_AND_MEAN=1 DEFINES += NTDDI_VERSION=0x05010000 + LIBS *= -lShell32 } win32-msvc* { @@ -130,6 +129,7 @@ win32-msvc201* { # unix also works for Android unix|win32-g++ { + LIBS *= -lz QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare -Wno-strict-aliasing -Wno-unused-parameter \ -Werror=return-type *-clang { @@ -182,10 +182,12 @@ win32-g++ { QMAKE_CXXFLAGS *= -Wextra QMAKE_LFLAGS *= -s QMAKE_LFLAGS_RELEASE *= -O + LIBS *= -lpthread } macx-* { QMAKE_LFLAGS *= -dead_strip + LIBS *= "-framework Foundation" # macx-clang { # QMAKE_CFLAGS_RELEASE -= -O3 |