flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 19:25:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T180, adjusted FSX/P3D includes

Browse Source 
* the fix header belongs into fsxcommon (not fsx) dir
* P3D is purely P3D, we do not build a P3D x86 driver
This commit is contained in:
Klaus Basan
2017-11-05 02:33:23 +01:00
parent e270a54a68
commit 6b3cdf52ee
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackmisc/simulation/fsx/simconnectutilities.h
View File

@@ -44,6 +44,7 @@ namespace BlackMisc
namespace Fsx namespace Fsx
{ {
//! Utilities for SimConnect //! Utilities for SimConnect
//! \remark not using the simconnect.h headers as BlackMisc classes are not driver aware
class BLACKMISC_EXPORT CSimConnectUtilities : public QObject class BLACKMISC_EXPORT CSimConnectUtilities : public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
View File

@@ -15,7 +15,7 @@
#include <QtGlobal> #include <QtGlobal>
#include "blackmisc/aviation/aircraftlights.h" #include "blackmisc/aviation/aircraftlights.h"
#include "../fsx/simconnectwindows.h" #include "../fsxcommon/simconnectwindows.h"
#include <algorithm> #include <algorithm>
#include <QString> #include <QString>

0
src/plugins/simulator/fsx/simconnectwindows.h → src/plugins/simulator/fsxcommon/simconnectwindows.h
View File

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -14,7 +14,7 @@
#include "simconnectdatadefinition.h" #include "simconnectdatadefinition.h"
#include "simconnectobject.h" #include "simconnectobject.h"
#include "../fsx/simconnectwindows.h" #include "../fsxcommon/simconnectwindows.h"
#include "../fscommon/simulatorfscommon.h" #include "../fscommon/simulatorfscommon.h"
#include "blackcore/simulator.h" #include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolatorlinear.h" #include "blackmisc/simulation/interpolatorlinear.h"

24
src/plugins/simulator/p3d/p3d.pro
View File

@@ -16,24 +16,14 @@ INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
equals(WORD_SIZE,64) { INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.1
}
equals(WORD_SIZE,32) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
}
LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc
equals(WORD_SIZE,64) { LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.1 LIBS *= -lAdvapi32
LIBS *= -lAdvapi32
CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug CONFIG(debug, debug|release): LIBS *= -lSimConnectDebug
else: LIBS *= -lSimConnect else: LIBS *= -lSimConnect
}
equals(WORD_SIZE,32) {
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lSimConnect
}
LIBS += -ldxguid -lole32 LIBS += -ldxguid -lole32
addStaticLibraryDependency(simulatorfscommon) addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon) addStaticLibraryDependency(simulatorfsxcommon)