From 6b3cdf52eec297e5101c6f485d8dc2c9a8ec958c Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 5 Nov 2017 02:33:23 +0100
Subject: [PATCH] Ref T180, adjusted FSX/P3D includes

* the fix header belongs into fsxcommon (not fsx) dir
* P3D is purely P3D, we do not build a P3D x86 driver
---
 .../simulation/fsx/simconnectutilities.h      |  1 +
 .../fsxcommon/simconnectdatadefinition.h      |  2 +-
 .../{fsx => fsxcommon}/simconnectwindows.h    |  0
 .../simulator/fsxcommon/simulatorfsxcommon.h  |  2 +-
 src/plugins/simulator/p3d/p3d.pro             | 24 ++++++-------------
 5 files changed, 10 insertions(+), 19 deletions(-)
 rename src/plugins/simulator/{fsx => fsxcommon}/simconnectwindows.h (100%)

diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.h b/src/blackmisc/simulation/fsx/simconnectutilities.h
index a841d6757..7bada04ec 100644
--- a/src/blackmisc/simulation/fsx/simconnectutilities.h
+++ b/src/blackmisc/simulation/fsx/simconnectutilities.h
@@ -44,6 +44,7 @@ namespace BlackMisc
         namespace Fsx
         {
             //! Utilities for SimConnect
+            //! \remark not using the simconnect.h headers as BlackMisc classes are not driver aware
             class BLACKMISC_EXPORT CSimConnectUtilities : public QObject
             {
                 Q_OBJECT
diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
index ef81628b9..c511e45b5 100644
--- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
+++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
@@ -15,7 +15,7 @@
 #include <QtGlobal>
 
 #include "blackmisc/aviation/aircraftlights.h"
-#include "../fsx/simconnectwindows.h"
+#include "../fsxcommon/simconnectwindows.h"
 #include <algorithm>
 #include <QString>
 
diff --git a/src/plugins/simulator/fsx/simconnectwindows.h b/src/plugins/simulator/fsxcommon/simconnectwindows.h
similarity index 100%
rename from src/plugins/simulator/fsx/simconnectwindows.h
rename to src/plugins/simulator/fsxcommon/simconnectwindows.h
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
index 6b24d73ea..dc456d718 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
@@ -14,7 +14,7 @@
 
 #include "simconnectdatadefinition.h"
 #include "simconnectobject.h"
-#include "../fsx/simconnectwindows.h"
+#include "../fsxcommon/simconnectwindows.h"
 #include "../fscommon/simulatorfscommon.h"
 #include "blackcore/simulator.h"
 #include "blackmisc/simulation/interpolatorlinear.h"
diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro
index 4941c93e3..42e7b6088 100644
--- a/src/plugins/simulator/p3d/p3d.pro
+++ b/src/plugins/simulator/p3d/p3d.pro
@@ -16,24 +16,14 @@ 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
-}
-
+INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
 LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc
-equals(WORD_SIZE,64) {
-    LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
-    LIBS *= -lAdvapi32
-    CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
-    else:                         LIBS *= -lSimConnect
-}
-equals(WORD_SIZE,32) {
-    LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
-    LIBS *= -lSimConnect
-}
+LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
+LIBS *= -lAdvapi32
+
+CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
+else:                         LIBS *= -lSimConnect
+
 LIBS += -ldxguid -lole32
 addStaticLibraryDependency(simulatorfscommon)
 addStaticLibraryDependency(simulatorfsxcommon)