flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Select externals subdir based on QMAKESPEC

Browse Source 
refs #468
This commit is contained in:
Roland Winklmeier
2015-11-22 19:41:47 +01:00
parent b033ee5cf1
commit b97a04373e
3 changed files with 19 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: f35c85c0f6...cd6142faf6

64
mkspecs/features/common_pre.prf
View File

@@ -97,66 +97,34 @@ include(defines.pri)
################################ ################################
# If you want to manually set the external path, uncomment the following line # If you want to manually set the external path, uncomment the following line
# EXTERNALDIR = /path/to/externals # EXTERNALSROOT = /path/to/externals
isEmpty(EXTERNALDIR) { isEmpty(EXTERNALSROOT) {
EXTERNALDIR = $$(VATSIM_EXTERNAL_DIR) EXTERNALSROOT = $$(VATSIM_EXTERNAL_DIR)
} }
isEmpty(EXTERNALDIR) { isEmpty(EXTERNALSROOT) {
EXTERNALDIR = $$SourceRoot/externals EXTERNALSROOT = $$SourceRoot/externals
} }
!exists("$$EXTERNALDIR/common/include") { !exists("$$EXTERNALSROOT/common/include") {
error("Could not find externals in $$EXTERNALDIR. Please install it!") error("Could not find externals in $$EXTERNALSROOT. Please install it!")
} }
################################ ################################
# Externals # Externals
################################ ################################
INCLUDEPATH *= $$EXTERNALDIR/common/include INCLUDEPATH *= $$EXTERNALSROOT/common/include
INCLUDEPATH *= $$EXTERNALSROOT/$$basename(QMAKESPEC)/include
# and the library path depending on the used compiler equals(WORD_SIZE,64): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
win32-msvc2013 { equals(WORD_SIZE,32): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
INCLUDEPATH *= $$EXTERNALDIR/win32-vs2013/include
equals(WORD_SIZE,64) { LIBS *= -L$$EXTERNALSDIR
EXTERNALLIBS = $$EXTERNALDIR/win32-vs2013/lib64 win32: LIBS *= -luser32
LIBS *= -L$$EXTERNALLIBS
} INCLUDEPATH *= $$EXTERNALDIR/common/include
equals(WORD_SIZE,32) {
EXTERNALLIBS = $$EXTERNALDIR/win32-vs2013/lib32
LIBS *= -L$$EXTERNALLIBS
}
equals(WORD_SIZE,32): LIBS += -luser32
}
win32-g++ {
INCLUDEPATH *= $$EXTERNALDIR/win32-g++/include
equals(WORD_SIZE,64) {
EXTERNALLIBS = $$EXTERNALDIR/win32-g++/lib64
LIBS *= -L$$EXTERNALLIBS
}
equals(WORD_SIZE,32) {
EXTERNALLIBS = $$EXTERNALDIR/win32-g++/lib32
LIBS *= -L$$EXTERNALLIBS
}
LIBS += -luser32
}
linux-g++* {
equals(WORD_SIZE,64) {
EXTERNALLIBS = $$EXTERNALDIR/linux-g++/lib64
LIBS *= -L$$EXTERNALLIBS
}
equals(WORD_SIZE,32) {
EXTERNALLIBS = $$EXTERNALDIR/linux-g++/lib32
LIBS *= -L$$EXTERNALLIBS
}
}
macx-clang {
INCLUDEPATH *= $$EXTERNALDIR/macx-clang/include
equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang/lib64 -F$$EXTERNALDIR/macx-clang/lib64
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang/lib32 -F$$EXTERNALDIR/macx-clang/lib32
}
################################ ################################
# Platform extensions # Platform extensions

2
src/xbus/xbus.pro
View File

@@ -7,7 +7,7 @@ TEMPLATE = lib
CONFIG += shared plugin CONFIG += shared plugin
CONFIG += blackmisc blackcore CONFIG += blackmisc blackcore
INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM INCLUDEPATH += $$EXTERNALSROOT/common/include/XPLM
win32 { win32 {
equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64 equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64