Skip to content

Shared flight #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
justinsnapp wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Shared flight #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
254184b
Turning off -Werror for now
Jul 23, 2020
7851a30
Adding Shared Flight detection and abort command for slaves
Jul 24, 2020
848b0a7
Turning off -Werror for now
Jul 23, 2020
d9c8e3a
Adding Shared Flight detection and abort command for slaves
Jul 24, 2020
8df52cf
ignore brake set check for slaves
justinsnapp Feb 1, 2022
10f358f
Merge branch 'SharedFlight' of https://github.com/sharedflight/Better…
Feb 1, 2022
c0dc099
making step be written to directly only if not slave
Mar 11, 2022
4679e6e
changes
Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions qmake/qmake.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ QT -= gui core
CONFIG += plugin debug
CONFIG -= thread exceptions qt rtti

INCLUDEPATH += $$[LIBACFUTILS]/SDK/CHeaders/XPLM
INCLUDEPATH += $$[LIBACFUTILS]/SDK/CHeaders/Widgets
INCLUDEPATH += $$[LIBACFUTILSBP]/SDK/CHeaders/XPLM
INCLUDEPATH += $$[LIBACFUTILSBP]/SDK/CHeaders/Widgets
# Always just use the shipped OpenAL headers for predictability.
# The ABI is X-Plane-internal and stable anyway.
INCLUDEPATH += $$[LIBACFUTILS]/OpenAL/include
INCLUDEPATH += $$[LIBACFUTILS]/src
INCLUDEPATH += $$[LIBACFUTILS]/acf_apis
INCLUDEPATH += $$[LIBACFUTILSBP]/OpenAL/include
INCLUDEPATH += $$[LIBACFUTILSBP]/src
INCLUDEPATH += $$[LIBACFUTILSBP]/acf_apis

QMAKE_CFLAGS += -std=c99 -g -W -Wall -Wextra -Werror -fvisibility=hidden \
-Wno-unused-local-typedefs -Wunused-result
Expand All @@ -53,7 +53,7 @@ DEFINES += BP_PLUGIN_VERSION=\'\"$$system("git describe --abbrev=0 --tags")\"\'
!macx {
LIBS += -static-libgcc
}

LIBACFUTILSBP
win32 {
CONFIG += dll
DEFINES += APL=0 IBM=1 LIN=0 _WIN32_WINNT=0x0600
Expand All @@ -63,16 +63,16 @@ win32 {
}

win32:contains(CROSS_COMPILE, x86_64-w64-mingw32-) {
QMAKE_CFLAGS += $$system("$$[LIBACFUTILS]/pkg-config-deps win-64 \
QMAKE_CFLAGS += $$system("$$[LIBACFUTILSBP]/pkg-config-deps win-64 \
--static-openal --cflags")

# This must go first for GCC to properly find dependent symbols
LIBS += -L$$[LIBACFUTILS]/qmake/win64 -lacfutils
LIBS += $$system("$$[LIBACFUTILS]/pkg-config-deps win-64 \
LIBS += -L$$[LIBACFUTILSBP]/qmake/win64 -lacfutils
LIBS += $$system("$$[LIBACFUTILSBP]/pkg-config-deps win-64 \
--static-openal --libs")

LIBS += -L$$[LIBACFUTILS]/SDK/Libraries/Win -lXPLM_64 -lXPWidgets_64
LIBS += -L$$[LIBACFUTILS]/GL_for_Windows/lib -lglu32 -lopengl32
LIBS += -L$$[LIBACFUTILSBP]/SDK/Libraries/Win -lXPLM_64 -lXPWidgets_64
LIBS += -L$$[LIBACFUTILSBP]/GL_for_Windows/lib -lglu32 -lopengl32
LIBS += -ldbghelp
}

Expand All @@ -85,11 +85,11 @@ unix:!macx {
}

linux-g++-64 {
QMAKE_CFLAGS += $$system("$$[LIBACFUTILS]/pkg-config-deps linux-64 \
QMAKE_CFLAGS += $$system("$$[LIBACFUTILSBP]/pkg-config-deps linux-64 \
--static-openal --cflags")

LIBS += -L$$[LIBACFUTILS]/qmake/lin64 -lacfutils
LIBS += $$system("$$[LIBACFUTILS]/pkg-config-deps linux-64 \
LIBS += -L$$[LIBACFUTILSBP]/qmake/lin64 -lacfutils
LIBS += $$system("$$[LIBACFUTILSBP]/pkg-config-deps linux-64 \
--static-openal --libs")
}

Expand All @@ -101,18 +101,18 @@ macx {

DEFINES += APL=1 IBM=0 LIN=0
TARGET = mac.xpl
LIBS += -F$$[LIBACFUTILS]/SDK/Libraries/Mac
LIBS += -F$$[LIBACFUTILSBP]/SDK/Libraries/Mac
LIBS += -framework OpenGL -framework AudioToolbox
LIBS += -framework CoreAudio -framework AudioUnit
LIBS += -framework XPLM -framework XPWidgets
}

macx-clang {
QMAKE_CFLAGS += $$system("$$[LIBACFUTILS]/pkg-config-deps mac-64 \
QMAKE_CFLAGS += $$system("$$[LIBACFUTILSBP]/pkg-config-deps mac-64 \
--static-openal --cflags")

LIBS += -L$$[LIBACFUTILS]/qmake/mac64 -lacfutils
LIBS += $$system("$$[LIBACFUTILS]/pkg-config-deps mac-64 \
LIBS += -L$$[LIBACFUTILSBP]/qmake/mac64 -lacfutils
LIBS += $$system("$$[LIBACFUTILSBP]/pkg-config-deps mac-64 \
--static-openal --libs")
}

Expand Down
Loading