diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf index 5669de3df..7407fba9a 100644 --- a/mkspecs/features/common_pre.prf +++ b/mkspecs/features/common_pre.prf @@ -80,8 +80,8 @@ win32-g++: QMAKE_CXXFLAGS_DEBUG += -Og # FSX or FS9 on 32bit Windows only ################################ +!win32: BLACK_CONFIG -= 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/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro index 42e7b6088..4941c93e3 100644 --- a/src/plugins/simulator/p3d/p3d.pro +++ b/src/plugins/simulator/p3d/p3d.pro @@ -16,14 +16,24 @@ INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1 +equals(WORD_SIZE,64) { + INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1 +} +equals(WORD_SIZE,32) { + INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack +} + LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1 -LIBS *= -lAdvapi32 - -CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug -else: LIBS *= -lSimConnect - +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 += -ldxguid -lole32 addStaticLibraryDependency(simulatorfscommon) addStaticLibraryDependency(simulatorfsxcommon) diff --git a/src/plugins/simulator/p3d/simulatorp3d.json b/src/plugins/simulator/p3d/simulatorp3d.json index 2e7d7d1b8..0a01f2d6d 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.json +++ b/src/plugins/simulator/p3d/simulatorp3d.json @@ -2,6 +2,6 @@ "identifier" : "org.swift-project.plugins.simulator.p3d", "name" : "PREPAR3D", "simulator" : "p3d", - "description" : "Lockheed Martin PREPAR3D (x64, v4)", + "description" : "Lockheed Martin PREPAR3D (v1-3 x86, v4 and later x64)", "config" : "org.swift-project.plugins.simulator.p3d.config" }