flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T270, Ref T275 FSX/P3D moved the common parts of the .pro files into .pri files and included those

Browse Source 
Remark: See also https://swift-project.slack.com/archives/G7GD2UP9C/p1528277800000196
This commit is contained in:
Klaus Basan
2018-06-06 01:14:53 +02:00
parent 78747782e4
commit f728efb3be
7 changed files with 63 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/simulator/fsx/fsx.pro
View File

@@ -1,37 +1,11 @@
load(common_pre)
REQUIRES += contains(BLACK_CONFIG,FSX)
QT += core dbus widgets
TARGET = simulatorfsx
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackconfig blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
SOURCES += *.cpp
HEADERS += *.h
REQUIRES += contains(BLACK_CONFIG,FSX)
TARGET = simulatorfsx
DISTFILES += simulatorfsx.json
DESTDIR = $$DestRoot/bin/plugins/simulator
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect -lsimulatorplugincommon
LIBS += -ldxguid -lole32
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
addStaticLibraryDependency(simulatorplugincommon)
win32 {
dlltarget.path = $$PREFIX/bin/plugins/simulator
INSTALLS += dlltarget
} else {
target.path = $$PREFIX/bin/plugins/simulator
INSTALLS += target
}
include(../fsxp3d.pri)
load(common_post)

20
src/plugins/simulator/fsxcommon/fsxcommon.pro
View File

@@ -5,30 +5,20 @@ QT += core dbus network widgets
TARGET = simulatorfsxcommon
TEMPLATE = lib
SOURCES += *.cpp
HEADERS += *.h
FORMS += *.ui
CONFIG += staticlib
CONFIG += blackconfig blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp
HEADERS += *.h
FORMS += *.ui
DESTDIR = $$DestRoot/lib
LIBS += -lsimulatorfscommon -lfsuipc -lsimulatorplugincommon
equals(WORD_SIZE,64) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
LIBS *= -lAdvapi32
CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
else: LIBS *= -lSimConnect
}
equals(WORD_SIZE,32) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lSimConnect
}
include(../fsxp3d_include.pri)
addStaticLibraryDependency(fsuipc)
addStaticLibraryDependency(simulatorplugincommon)

32
src/plugins/simulator/fsxconfig/fsxconfig.pro
View File

@@ -1,35 +1,11 @@
load(common_pre)
QT += core dbus network widgets
TARGET = simulatorfsxconfig
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackconfig blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp
HEADERS += *.h
DISTFILES += simulatorfsxconfig.json
LIBS += -lsimulatorfsxcommon
DESTDIR = $$DestRoot/bin/plugins/simulator
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect -lsimulatorplugincommon
LIBS += -ldxguid -lole32
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
addStaticLibraryDependency(simulatorplugincommon)
win32 {
dlltarget.path = $$PREFIX/bin/plugins/simulator
INSTALLS += dlltarget
} else {
target.path = $$PREFIX/bin/plugins/simulator
INSTALLS += target
}
REQUIRES += contains(BLACK_CONFIG,FSX)
TARGET = simulatorfsxconfig
DISTFILES += simulatorfsx.json
include(../fsxp3d.pri)
load(common_post)

30
src/plugins/simulator/fsxp3d.pri Normal file
View File

@@ -0,0 +1,30 @@
QT += core dbus widgets
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackconfig blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$DestRoot/bin/plugins/simulator
LIBS += -lsimulatorfsxcommon -lsimulatorfscommon -lfsuipc -lsimulatorplugincommon
include(fsxp3d_include.pri)
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
addStaticLibraryDependency(simulatorplugincommon)
# Ignore linker warning about missing pdb files from Simconnect
msvc: QMAKE_LFLAGS *= /ignore:4099
win32 {
dlltarget.path = $$PREFIX/bin/plugins/simulator
INSTALLS += dlltarget
} else {
target.path = $$PREFIX/bin/plugins/simulator
INSTALLS += target
}

12
src/plugins/simulator/fsxp3d_include.pri Normal file
View File

@@ -0,0 +1,12 @@
equals(WORD_SIZE,64) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
LIBS *= -lAdvapi32
CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
else: LIBS *= -lSimConnect
}
equals(WORD_SIZE,32) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lSimConnect
}

48
src/plugins/simulator/p3d/p3d.pro
View File

@@ -1,51 +1,11 @@
load(common_pre)
REQUIRES += contains(BLACK_CONFIG,P3D)
QT += core dbus widgets
TARGET = simulatorp3d
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackconfig blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp
HEADERS += *.h
REQUIRES += contains(BLACK_CONFIG,P3D)
TARGET = simulatorp3d
DISTFILES += simulatorp3d.json
DESTDIR = $$DestRoot/bin/plugins/simulator
LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lsimulatorplugincommon
equals(WORD_SIZE,64) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
LIBS *= -lAdvapi32
CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
else: LIBS *= -lSimConnect
}
equals(WORD_SIZE,32) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lSimConnect
}
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
addStaticLibraryDependency(simulatorplugincommon)
# Ignore linker warning about missing pdb files from Simconnect
msvc: QMAKE_LFLAGS *= /ignore:4099
win32 {
dlltarget.path = $$PREFIX/bin/plugins/simulator
INSTALLS += dlltarget
} else {
target.path = $$PREFIX/bin/plugins/simulator
INSTALLS += target
}
include(../fsxp3d.pri)
load(common_post)

42
src/plugins/simulator/p3dconfig/p3dconfig.pro
View File

@@ -1,45 +1,11 @@
load(common_pre)
QT += core dbus network widgets
TARGET = simulatorp3dconfig
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackconfig blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp
HEADERS += *.h
REQUIRES += contains(BLACK_CONFIG,P3D)
TARGET = simulatorp3dconfig
DISTFILES += simulatorp3d.json
DESTDIR = $$DestRoot/bin/plugins/simulator
LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lsimulatorplugincommon
equals(WORD_SIZE,64) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
LIBS *= -lAdvapi32
CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
else: LIBS *= -lSimConnect
}
equals(WORD_SIZE,32) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lSimConnect
}
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
addStaticLibraryDependency(simulatorplugincommon)
win32 {
dlltarget.path = $$PREFIX/bin/plugins/simulator
INSTALLS += dlltarget
} else {
target.path = $$PREFIX/bin/plugins/simulator
INSTALLS += target
}
include(../fsxp3d.pri)
load(common_post)