flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #17 Add xplanemp2 submodule

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-05-21 00:02:00 +01:00
parent 8e2615557f
commit 1b2b33cf90
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -4,3 +4,6 @@
[submodule "src/xswiftbus/libxplanemp"] [submodule "src/xswiftbus/libxplanemp"]
path = src/xswiftbus/libxplanemp path = src/xswiftbus/libxplanemp
url = git@github.com:swift-project/libxplanemp.git url = git@github.com:swift-project/libxplanemp.git
[submodule "src/xswiftbus/xplanemp2"]
path = src/xswiftbus/xplanemp2
url = git@github.com:swift-project/xplanemp2.git

2
docs/Doxyfile.qmake
View File

@@ -802,7 +802,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is # Note that relative paths are relative to the directory from which doxygen is
# run. # run.
EXCLUDE = $(DOXY_SRC_ROOT)/src/xswiftbus/libxplanemp \ EXCLUDE = $(DOXY_SRC_ROOT)/src/xswiftbus/xplanemp2 \
$(DOXY_SRC_ROOT)/src/plugins/simulator/fsuipc32 \ $(DOXY_SRC_ROOT)/src/plugins/simulator/fsuipc32 \
$(DOXY_SRC_ROOT)/src/plugins/simulator/fsuipc64 \ $(DOXY_SRC_ROOT)/src/plugins/simulator/fsuipc64 \
$(DOXY_SRC_ROOT)/src/plugins/weatherdata/gfs/g2clib $(DOXY_SRC_ROOT)/src/plugins/weatherdata/gfs/g2clib

1
src/xswiftbus/xplanemp2 Submodule

Submodule src/xswiftbus/xplanemp2 added at 71b339f88c

20
src/xswiftbus/xswiftbus.pro
View File

@@ -36,9 +36,9 @@ SOURCES += $$files($$PWD/*.cpp)
HEADERS += $$files($$PWD/*.h) HEADERS += $$files($$PWD/*.h)
# Using the $$files function so we can remove some with -= below # Using the $$files function so we can remove some with -= below
SOURCES += $$files(libxplanemp/src/*.cpp) SOURCES += $$files(xplanemp2/src/*.cpp)
HEADERS += $$files(libxplanemp/src/*.h) $$files(libxplanemp/include/*.h) HEADERS += $$files(xplanemp2/src/*.h) $$files(xplanemp2/include/*.h)
INCLUDEPATH += ./libxplanemp ./libxplanemp/include ./libxplanemp/src INCLUDEPATH += ./xplanemp2 ./xplanemp2/include ./xplanemp2/src
unix:!macx { unix:!macx {
INCLUDEPATH *= /usr/include/dbus-1.0 INCLUDEPATH *= /usr/include/dbus-1.0
@@ -50,10 +50,10 @@ unix:!macx {
} }
# PlatformUtils also not used # PlatformUtils also not used
SOURCES -= $$files(libxplanemp/src/PlatformUtils.*.cpp) SOURCES -= $$files(xplanemp2/src/PlatformUtils.*.cpp)
HEADERS -= libxplanemp/src/PlatformUtils.h HEADERS -= xplanemp2/src/PlatformUtils.h
# Externals required by libxplanemp # Externals required by xplanemp2
CONFIG += opengl CONFIG += opengl
msvc { msvc {
CONFIG(debug, debug|release): LIBS += -lpngd -lzd -lopengl32 -lglu32 CONFIG(debug, debug|release): LIBS += -lpngd -lzd -lopengl32 -lglu32
@@ -64,17 +64,15 @@ else: LIBS += -lpng -lz
msvc: DEFINES += _CRT_SECURE_NO_WARNINGS msvc: DEFINES += _CRT_SECURE_NO_WARNINGS
# Required by X-Plane SDK and libxplanemp # Required by X-Plane SDK and xplanemp2
win32:DEFINES += IBM=1 win32:DEFINES += IBM=1
linux:DEFINES += LIN=1 linux:DEFINES += LIN=1
macx:DEFINES += APL=1 macx:DEFINES += APL=1
DEFINES += XPLM200=1 DEFINES += XPLM200=1
# XPLM210 is required for new features in libxplanemp,
# but means we lose support for X-Plane 9 and earlier versions.
# TODO add config option to select minimum X-Plane version when building
DEFINES += XPLM210=1 DEFINES += XPLM210=1
DEFINES += XPLM300=1
# Name will be used in libxplanemp log messages # Name will be used in xplanemp2 log messages
DEFINES += XPMP_CLIENT_NAME=\\\"xswiftbus\\\" DEFINES += XPMP_CLIENT_NAME=\\\"xswiftbus\\\"
DEFINES += XPMP_CLIENT_LONGNAME=\\\"xswiftbus\\\" DEFINES += XPMP_CLIENT_LONGNAME=\\\"xswiftbus\\\"