flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update externals

Browse Source
This commit is contained in:
Roland Winklmeier
2018-04-04 12:08:14 +02:00
parent 6fec158534
commit 6a19f7c334
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: 2ee6c3869e...fc3fd64ee7

27
mkspecs/features/externals.pri
View File

@@ -23,32 +23,37 @@ isEmpty(EXTERNALSROOT) {
EXTERNALS_SPEC = $$basename(QMAKESPEC) EXTERNALS_SPEC = $$basename(QMAKESPEC)
msvc { msvc {
clang_cl: EXTERNALS_SPEC = win32-msvc2015 clang_cl: EXTERNALS_SPEC = win32-msvc
win32-msvc2017: EXTERNALS_SPEC = win32-msvc2015
win32-msvc { win32-msvc {
# From Qt 5.8.1 onwards, QMAKESPEC is win32-msvc without the version number # From Qt 5.8.1 onwards, QMAKESPEC is win32-msvc without the version number
# see https://codereview.qt-project.org/#/c/162754/ # see https://codereview.qt-project.org/#/c/162754/
lessThan(MSVC_VER, 14.0) | greaterThan(MSVC_VER, 15.0) { lessThan(MSVC_VER, 14.0) | greaterThan(MSVC_VER, 15.0) {
error(This version of Visual Studio is not supported (MSVC_VER = $$MSVC_VER)) error(This version of Visual Studio is not supported (MSVC_VER = $$MSVC_VER))
} }
EXTERNALS_SPEC = win32-msvc2015
} }
} }
INCLUDEPATH *= $$EXTERNALSROOT/common/include win32 {
INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/include INCLUDEPATH *= $$EXTERNALSROOT/common/include
}
else:macx {
INCLUDEPATH *= $$EXTERNALSROOT/common/include
}
else:unix: {
QMAKE_CXXFLAGS *= -idirafter $$EXTERNALSROOT/common/include
}
equals(WORD_SIZE,64) { equals(WORD_SIZE,64) {
EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/bin64 EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/bin
EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/lib64 EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/lib
INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/include
} }
equals(WORD_SIZE,32) { equals(WORD_SIZE,32) {
EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/bin32 EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/bin
EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/lib32 EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/lib
INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/include
} }
LIBS *= -L$$EXTERNALS_LIB_DIR LIBS *= -L$$EXTERNALS_LIB_DIR
macx: LIBS *= -F$$EXTERNALS_LIB_DIR macx: LIBS *= -F$$EXTERNALS_LIB_DIR
win32: LIBS *= -luser32 win32: LIBS *= -luser32
INCLUDEPATH *= $$EXTERNALDIR/common/include