From 984b30aef32049f9daa9c25acafe9c682b92ed2f Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 29 Jun 2017 13:38:25 +0200 Subject: [PATCH] Enable P3D-v4 64 bit build Summary: This commit enables P3D-v4 for 64 bit including all dependent libraries. Those binaries are not yet installed, since they are considered experimental. Reviewers: #swift_pilot_client, msutcliffe Reviewed By: #swift_pilot_client, msutcliffe Differential Revision: https://dev.swift-project.org/D30 --- externals | 2 +- mkspecs/features/common_pre.prf | 5 ++-- src/plugins/simulator/fs9/fs9.pro | 3 +-- src/plugins/simulator/fsx/fsx.pro | 5 ++-- .../simulator/fsx/simulatorfsxfactory.h | 1 - src/plugins/simulator/fsxcommon/fsxcommon.pro | 7 +++++ .../fsxcommon/simconnectdatadefinition.h | 2 +- .../simulator/fsxcommon/simulatorfsxcommon.h | 2 +- src/plugins/simulator/p3d/p3d.pro | 27 ++++++++++++++++--- .../simulator/p3d/simulatorp3dfactory.h | 1 - 10 files changed, 40 insertions(+), 15 deletions(-) diff --git a/externals b/externals index 73be1b8c3..a5758d744 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 73be1b8c372118a3da82494af8a4106d1ae72ed3 +Subproject commit a5758d74433e43086b6bdac365a21c5ffa53025c diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf index fbd32c2a0..5c62b0284 100644 --- a/mkspecs/features/common_pre.prf +++ b/mkspecs/features/common_pre.prf @@ -77,10 +77,11 @@ msvc:!llvm: QMAKE_CXXFLAGS *= /bigobj win32-g++: QMAKE_CXXFLAGS_DEBUG += -Og ################################ -# FSX, P3D or FS9 on 32bit Windows only +# FSX or FS9 on 32bit Windows only ################################ -equals(WORD_SIZE,64)|!win32: BLACK_CONFIG -= FSX FS9 P3D +equals(WORD_SIZE,64)|!win32: BLACK_CONFIG -= FSX FS9 +equals(WORD_SIZE,32)|!win32: BLACK_CONFIG -= P3D ################################ # For BlackMisc::getStackTrace diff --git a/src/plugins/simulator/fs9/fs9.pro b/src/plugins/simulator/fs9/fs9.pro index 47ae9cf30..f8dfd5fe5 100644 --- a/src/plugins/simulator/fs9/fs9.pro +++ b/src/plugins/simulator/fs9/fs9.pro @@ -8,11 +8,10 @@ TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore -LIBS += -lsimulatorfscommon -lfsuipc -luuid - DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src +LIBS += -lsimulatorfscommon -lfsuipc -luuid LIBS += -ldxguid -lole32 SOURCES += *.cpp diff --git a/src/plugins/simulator/fsx/fsx.pro b/src/plugins/simulator/fsx/fsx.pro index 67a9da1fb..d643aabd2 100644 --- a/src/plugins/simulator/fsx/fsx.pro +++ b/src/plugins/simulator/fsx/fsx.pro @@ -10,11 +10,12 @@ TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore -LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect - DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src +INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack +LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack +LIBS *= -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect LIBS += -ldxguid -lole32 SOURCES += *.cpp diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index 777147a2f..e8e92a56f 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -15,7 +15,6 @@ #include "blackcore/simulator.h" #include "blackmisc/simulation/simulatorplugininfo.h" -#include #include #include diff --git a/src/plugins/simulator/fsxcommon/fsxcommon.pro b/src/plugins/simulator/fsxcommon/fsxcommon.pro index 1770077ae..a7400cd08 100644 --- a/src/plugins/simulator/fsxcommon/fsxcommon.pro +++ b/src/plugins/simulator/fsxcommon/fsxcommon.pro @@ -11,6 +11,13 @@ CONFIG += blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src +equals(WORD_SIZE,64) { + INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4 +} +equals(WORD_SIZE,32) { + INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack +} + SOURCES += *.cpp HEADERS += *.h FORMS += *.ui diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h index a0fca07dd..e0e31e2ff 100644 --- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h +++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h @@ -18,7 +18,7 @@ #define NOMINMAX #endif #include "blackmisc/aviation/aircraftlights.h" -#include +#include #include #include #include diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index c9dd87b97..eb5831eba 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -26,7 +26,7 @@ #include "blackmisc/network/client.h" #include "blackmisc/pixmap.h" -#include +#include #include #include #include diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro index a14577e5c..1b57b8f1b 100644 --- a/src/plugins/simulator/p3d/p3d.pro +++ b/src/plugins/simulator/p3d/p3d.pro @@ -10,15 +10,34 @@ TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore -LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect - DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src -LIBS += -ldxguid -lole32 - SOURCES += *.cpp HEADERS += *.h + +equals(WORD_SIZE,64) { + INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4 +} +equals(WORD_SIZE,32) { + INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack +} + +LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc +equals(WORD_SIZE,64) { + LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4 + CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug + else: LIBS *= -lSimConnect +} +equals(WORD_SIZE,32) { + LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack + LIBS *= -lSimConnect +} +LIBS += -ldxguid -lole32 + +# Ignore linker warning about missing pdb files from Simconnect +msvc: QMAKE_LFLAGS *= /ignore:4099 + DISTFILES += simulatorp3d.json DESTDIR = $$DestRoot/bin/plugins/simulator diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.h b/src/plugins/simulator/p3d/simulatorp3dfactory.h index c680ca32c..0a6310280 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.h +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.h @@ -15,7 +15,6 @@ #include "blackcore/simulator.h" #include "blackmisc/simulation/simulatorplugininfo.h" -#include #include #include