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

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>
 

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"

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)