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

refs #282 update to new externals layout

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-07-01 23:02:02 +01:00
parent 1e89771de0
commit 4bb7f8d164
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
externals.pri
View File

@@ -16,12 +16,12 @@ isEmpty(EXTERNALDIR) {
} }
# Test the folder if it exists and has a include subfolder # Test the folder if it exists and has a include subfolder
!exists("$$EXTERNALDIR/include") { !exists("$$EXTERNALDIR/common/include") {
error("Could not find externals in $$EXTERNALDIR. Please install it!") error("Could not find externals in $$EXTERNALDIR. Please install it!")
} }
# Everything is fine. Add the include path # Everything is fine. Add the include path
INCLUDEPATH *= $$EXTERNALDIR/include INCLUDEPATH *= $$EXTERNALDIR/common/include
# and the library path depending on the used compiler # and the library path depending on the used compiler
win32-msvc2010 { win32-msvc2010 {
@@ -30,13 +30,15 @@ win32-msvc2010 {
equals(WORD_SIZE,32): LIBS += -luser32 equals(WORD_SIZE,32): LIBS += -luser32
} }
win32-msvc2013 { win32-msvc2013 {
equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/vs2013_64/lib INCLUDEPATH *= $$EXTERNALDIR/win32-vs2013/include
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/vs2013_32/lib equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/win32-vs2013/lib64
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/win32-vs2013/lib32
equals(WORD_SIZE,32): LIBS += -luser32 equals(WORD_SIZE,32): LIBS += -luser32
} }
win32-g++ { win32-g++ {
equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/mingw64/lib INCLUDEPATH *= $$EXTERNALDIR/win32-g++/include
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/mingw32/lib equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/win32-g++/lib64
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/win32-g++/lib32
LIBS += -luser32 LIBS += -luser32
} }
linux-g++* { linux-g++* {
@@ -44,6 +46,7 @@ linux-g++* {
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/linux32/lib equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/linux32/lib
} }
macx-clang { macx-clang {
equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang64/lib -F$$EXTERNALDIR/macx-clang64/lib INCLUDEPATH *= $$EXTERNALDIR/macx-clang/include
equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang32/lib -F$$EXTERNALDIR/macx-clang32/lib 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
} }

2
src/xbus/xbus.pro
View File

@@ -89,4 +89,4 @@ include (../../libraries.pri)
# TODO refactor .pri files into common_pre.pri and common_post.pri # TODO refactor .pri files into common_pre.pri and common_post.pri
# to sort out this include order fiasco # to sort out this include order fiasco
INCLUDEPATH += $$EXTERNALDIR/include/XPLM INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM