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

Enable P3D-v4 64 bit build

Browse Source 
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
This commit is contained in:
Roland Winklmeier
2017-06-29 13:38:25 +02:00
committed by Mathew Sutcliffe
parent d15b6446e3
commit 984b30aef3
10 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: 73be1b8c37...a5758d7443

5
mkspecs/features/common_pre.prf
View File

@@ -77,10 +77,11 @@ msvc:!llvm: QMAKE_CXXFLAGS *= /bigobj
win32-g++: QMAKE_CXXFLAGS_DEBUG += -Og 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 # For BlackMisc::getStackTrace

3
src/plugins/simulator/fs9/fs9.pro
View File

@@ -8,11 +8,10 @@ TEMPLATE = lib
CONFIG += plugin shared CONFIG += plugin shared
CONFIG += blackmisc blackcore CONFIG += blackmisc blackcore
LIBS += -lsimulatorfscommon -lfsuipc -luuid
DEPENDPATH += . $$SourceRoot/src DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
LIBS += -lsimulatorfscommon -lfsuipc -luuid
LIBS += -ldxguid -lole32 LIBS += -ldxguid -lole32
SOURCES += *.cpp SOURCES += *.cpp

5
src/plugins/simulator/fsx/fsx.pro
View File

@@ -10,11 +10,12 @@ TEMPLATE = lib
CONFIG += plugin shared CONFIG += plugin shared
CONFIG += blackmisc blackcore CONFIG += blackmisc blackcore
LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect
DEPENDPATH += . $$SourceRoot/src DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$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 LIBS += -ldxguid -lole32
SOURCES += *.cpp SOURCES += *.cpp

1
src/plugins/simulator/fsx/simulatorfsxfactory.h
View File

@@ -15,7 +15,6 @@
#include "blackcore/simulator.h" #include "blackcore/simulator.h"
#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfo.h"
#include <simconnect/SimConnect.h>
#include <QObject> #include <QObject>
#include <QtPlugin> #include <QtPlugin>

7
src/plugins/simulator/fsxcommon/fsxcommon.pro
View File

@@ -11,6 +11,13 @@ CONFIG += blackmisc blackcore blackgui
DEPENDPATH += . $$SourceRoot/src DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$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 SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
FORMS += *.ui FORMS += *.ui

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

@@ -18,7 +18,7 @@
#define NOMINMAX #define NOMINMAX
#endif #endif
#include "blackmisc/aviation/aircraftlights.h" #include "blackmisc/aviation/aircraftlights.h"
#include <simconnect/SimConnect.h> #include <SimConnect.h>
#include <windows.h> #include <windows.h>
#include <algorithm> #include <algorithm>
#include <QString> #include <QString>

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

@@ -26,7 +26,7 @@
#include "blackmisc/network/client.h" #include "blackmisc/network/client.h"
#include "blackmisc/pixmap.h" #include "blackmisc/pixmap.h"
#include <simconnect/SimConnect.h> #include <SimConnect.h>
#include <QObject> #include <QObject>
#include <QtPlugin> #include <QtPlugin>
#include <QHash> #include <QHash>

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

@@ -10,15 +10,34 @@ TEMPLATE = lib
CONFIG += plugin shared CONFIG += plugin shared
CONFIG += blackmisc blackcore CONFIG += blackmisc blackcore
LIBS += -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect
DEPENDPATH += . $$SourceRoot/src DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
LIBS += -ldxguid -lole32
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h 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 DISTFILES += simulatorp3d.json
DESTDIR = $$DestRoot/bin/plugins/simulator DESTDIR = $$DestRoot/bin/plugins/simulator

1
src/plugins/simulator/p3d/simulatorp3dfactory.h
View File

@@ -15,7 +15,6 @@
#include "blackcore/simulator.h" #include "blackcore/simulator.h"
#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfo.h"
#include <simconnect/SimConnect.h>
#include <QObject> #include <QObject>
#include <QtPlugin> #include <QtPlugin>