From 78747782e48501d515ef6af4d6bac35d170d7726 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 6 Jun 2018 01:12:16 +0200 Subject: [PATCH] Ref T270, Ref T275 FSX/P3D .pro files adjusted --- src/plugins/simulator/fsx/fsx.pro | 10 +++---- src/plugins/simulator/fsxcommon/fsxcommon.pro | 27 ++++++++++++------- src/plugins/simulator/fsxconfig/fsxconfig.pro | 10 +++++-- src/plugins/simulator/p3d/p3d.pro | 17 ++++-------- src/plugins/simulator/p3dconfig/p3dconfig.pro | 26 ++++++++++++++---- 5 files changed, 56 insertions(+), 34 deletions(-) diff --git a/src/plugins/simulator/fsx/fsx.pro b/src/plugins/simulator/fsx/fsx.pro index ccc1de17f..8016473d9 100644 --- a/src/plugins/simulator/fsx/fsx.pro +++ b/src/plugins/simulator/fsx/fsx.pro @@ -13,6 +13,10 @@ CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack +SOURCES += *.cpp +HEADERS += *.h +DISTFILES += simulatorfsx.json +DESTDIR = $$DestRoot/bin/plugins/simulator LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack LIBS *= -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect -lsimulatorplugincommon @@ -22,12 +26,6 @@ addStaticLibraryDependency(simulatorfsxcommon) addStaticLibraryDependency(fsuipc) addStaticLibraryDependency(simulatorplugincommon) -SOURCES += *.cpp -HEADERS += *.h -DISTFILES += simulatorfsx.json - -DESTDIR = $$DestRoot/bin/plugins/simulator - win32 { dlltarget.path = $$PREFIX/bin/plugins/simulator INSTALLS += dlltarget diff --git a/src/plugins/simulator/fsxcommon/fsxcommon.pro b/src/plugins/simulator/fsxcommon/fsxcommon.pro index af72c3012..2eecdc0ba 100644 --- a/src/plugins/simulator/fsxcommon/fsxcommon.pro +++ b/src/plugins/simulator/fsxcommon/fsxcommon.pro @@ -10,18 +10,27 @@ CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src - -equals(WORD_SIZE,64) { - INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1 -} -equals(WORD_SIZE,32) { - INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack -} - 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 +} + +addStaticLibraryDependency(fsuipc) +addStaticLibraryDependency(simulatorplugincommon) + load(common_post) diff --git a/src/plugins/simulator/fsxconfig/fsxconfig.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro index 3c5ce2363..27acd5e5d 100644 --- a/src/plugins/simulator/fsxconfig/fsxconfig.pro +++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro @@ -14,10 +14,16 @@ SOURCES += *.cpp HEADERS += *.h DISTFILES += simulatorfsxconfig.json LIBS += -lsimulatorfsxcommon -addStaticLibraryDependency(simulatorfsxcommon) - 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 diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro index 1f8d19d39..58b5cb18e 100644 --- a/src/plugins/simulator/p3d/p3d.pro +++ b/src/plugins/simulator/p3d/p3d.pro @@ -12,30 +12,26 @@ CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src - SOURCES += *.cpp HEADERS += *.h - -equals(WORD_SIZE,64) { - INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1 -} -equals(WORD_SIZE,32) { - INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack -} +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 } -LIBS += -ldxguid -lole32 + addStaticLibraryDependency(simulatorfscommon) addStaticLibraryDependency(simulatorfsxcommon) addStaticLibraryDependency(fsuipc) @@ -44,9 +40,6 @@ addStaticLibraryDependency(simulatorplugincommon) # Ignore linker warning about missing pdb files from Simconnect msvc: QMAKE_LFLAGS *= /ignore:4099 -DISTFILES += simulatorp3d.json -DESTDIR = $$DestRoot/bin/plugins/simulator - win32 { dlltarget.path = $$PREFIX/bin/plugins/simulator INSTALLS += dlltarget diff --git a/src/plugins/simulator/p3dconfig/p3dconfig.pro b/src/plugins/simulator/p3dconfig/p3dconfig.pro index d1cf949b7..382ba8835 100644 --- a/src/plugins/simulator/p3dconfig/p3dconfig.pro +++ b/src/plugins/simulator/p3dconfig/p3dconfig.pro @@ -9,15 +9,31 @@ CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src - SOURCES += *.cpp HEADERS += *.h -DISTFILES += simulatorp3dconfig.json -LIBS += -lsimulatorfsxcommon -addStaticLibraryDependency(simulatorfsxcommon) - +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