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

refs #482 Project files changed to use new qmake feature files and build directory structure.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-10-06 23:36:49 +01:00
parent dbb5a240da
commit 6b75de0b3f
24 changed files with 121 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/doxygen.pro
View File

@@ -1,3 +1,5 @@
load(common_pre)
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG -= qt CONFIG -= qt
@@ -6,15 +8,15 @@ DOXYFILE = Doxyfile.qmake
DOXY_INPUT = . DOXY_INPUT = .
win32-g++ { win32-g++ {
doxy.commands = set DOXY_SRC_ROOT=$$PWD\\..\\src & \ doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \
doxygen $$PWD/$$DOXYFILE doxygen $$PWD/$$DOXYFILE
} }
else:win32 { else:win32 {
doxy.commands = set DOXY_SRC_ROOT=$$PWD\\..\\src & \ doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \
doxygen $$PWD\\$$DOXYFILE doxygen $$PWD\\$$DOXYFILE
} }
else { else {
doxy.commands = DOXY_SRC_ROOT="$$PWD/../src" \ doxy.commands = DOXY_SRC_ROOT="$$SourceRoot/src" \
doxygen $$PWD/$$DOXYFILE doxygen $$PWD/$$DOXYFILE
} }
doxy.CONFIG = no_link target_predeps doxy.CONFIG = no_link target_predeps
@@ -24,3 +26,5 @@ doxy.name = DOXY
doxy.output = html/index.html doxy.output = html/index.html
QMAKE_EXTRA_COMPILERS += doxy QMAKE_EXTRA_COMPILERS += doxy
OTHER_FILES += Doxyfile.qmake OTHER_FILES += Doxyfile.qmake
load(common_post)

7
samples/blackmisc/sample_blackmisc.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network QT += core dbus network
@@ -13,11 +12,11 @@ CONFIG += blackmisc
DEPENDPATH += . $$SourceRoot/src/blackmisc DEPENDPATH += . $$SourceRoot/src/blackmisc
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
OTHER_FILES += OTHER_FILES +=
include ($$SourceRoot/libraries.pri) load(common_post)

7
samples/blackmiscdbus/sample_blackmisc_dbus.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network QT += core dbus network
@@ -13,11 +12,11 @@ CONFIG += blackmisc blackcore
DEPENDPATH += . $$SourceRoot/src/blackmisc $$SourceRoot/src/blackcore DEPENDPATH += . $$SourceRoot/src/blackmisc $$SourceRoot/src/blackcore
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
OTHER_FILES += *.txt *.xml OTHER_FILES += *.txt *.xml
include ($$SourceRoot/libraries.pri) load(common_post)

7
samples/blackmiscquantities/sample_quantities_aviation.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network QT += core dbus network
@@ -13,9 +12,9 @@ CONFIG += blackmisc
DEPENDPATH += . $$SourceRoot/src/blackmisc DEPENDPATH += . $$SourceRoot/src/blackmisc
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
include ($$SourceRoot/libraries.pri) load(common_post)

7
samples/blackmiscsim/sample_blackmisc_sim.pro
View File

@@ -1,5 +1,4 @@
include (../../config.pri) load(common_pre)
include (../../build.pri)
QT += core dbus network xml QT += core dbus network xml
@@ -13,9 +12,9 @@ CONFIG += blackmisc blacksim
DEPENDPATH += . ../../src/blackmisc DEPENDPATH += . ../../src/blackmisc
INCLUDEPATH += . ../../src INCLUDEPATH += . ../../src
DESTDIR = ../../bin DESTDIR = $$DestRoot/bin
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
include (../../libraries.pri) load(common_post)

7
samples/cli_client/sample_cli_client.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network QT += core dbus network
@@ -16,6 +15,6 @@ INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
include ($$SourceRoot/libraries.pri) load(common_post)

7
samples/hotkey/sample_hotkey.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core gui dbus network QT += core gui dbus network
@@ -16,6 +15,6 @@ INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp SOURCES += *.cpp
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
include ($$SourceRoot/libraries.pri) load(common_post)

9
src/blackcore/blackcore.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
# GUI is required for the matrix classes # GUI is required for the matrix classes
# Network for host info etc. # Network for host info etc.
@@ -31,9 +30,9 @@ SOURCES += $$PWD/settings/*.cpp
LIBS *= -lvatlib2 LIBS *= -lvatlib2
DESTDIR = $$BuildRoot/lib DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$BuildRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += readme.txt *.xml OTHER_FILES += readme.txt *.xml
include ($$SourceRoot/libraries.pri) load(common_post)

19
src/blackgui/blackgui.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += network dbus gui svg QT += network dbus gui svg
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -51,8 +50,8 @@ win32 {
RESOURCES += RESOURCES +=
DESTDIR = $$BuildRoot/lib DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$BuildRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini *.ico *.rc OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini *.ico *.rc
@@ -60,13 +59,13 @@ win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yi
else: COPY = cp -r else: COPY = cp -r
win32 { win32 {
QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/qss) \ QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/qss) \
$$shell_path($$OUT_PWD/../../bin/qss) $$shell_path($$DestRoot/bin/qss)
} }
else { else {
QMAKE_POST_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) && \ QMAKE_POST_LINK += mkdir -p $$shell_path($$DestRoot/bin) && \
$$COPY $$shell_path($$PWD/qss) \ $$COPY $$shell_path($$PWD/qss) \
$$shell_path($$OUT_PWD/../../bin) $$shell_path($$DestRoot/bin)
} }
include ($$SourceRoot/libraries.pri) load(common_post)

9
src/blackinput/blackinput.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += network dbus gui widgets multimedia QT += network dbus gui widgets multimedia
@@ -43,10 +42,10 @@ macx {
LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit
} }
DESTDIR = $$BuildRoot/lib DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$BuildRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += OTHER_FILES +=
RESOURCES += RESOURCES +=
include ($$SourceRoot/libraries.pri) load(common_post)

27
src/blackmisc/blackmisc.pro
View File

@@ -1,6 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
include ($$SourceRoot/resources/swift_resources.pri)
QT += network dbus xml QT += network dbus xml
@@ -54,9 +52,26 @@ SOURCES += *.cpp \
$$PWD/simulation/fsx/*.cpp \ $$PWD/simulation/fsx/*.cpp \
$$PWD/weather/*.cpp $$PWD/weather/*.cpp
DESTDIR = $$BuildRoot/lib DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$BuildRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += $$TRANSLATIONS readme.txt OTHER_FILES += $$TRANSLATIONS readme.txt
include ($$SourceRoot/libraries.pri) win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yis
else: COPY = cp -r
win32 {
QMAKE_PRE_LINK += $$COPY $$shell_path($$SourceRoot/resources/data) \
$$shell_path($$DestRoot/resources) \
& $$COPY $$shell_path($$SourceRoot/resources/swiftDB) \
$$shell_path($$DestRoot/resources/swiftDB)
}
else {
QMAKE_PRE_LINK += mkdir -p $$shell_path($$DestRoot/resources) \
&& $$COPY $$shell_path($$SourceRoot/resources/data) \
$$shell_path($$DestRoot/resources) \
&& $$COPY $$shell_path($$SourceRoot/resources/swiftDB) \
$$shell_path($$DestRoot/resources/swiftDB)
}
load(common_post)

19
src/blacksound/blacksound.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += network dbus gui multimedia QT += network dbus gui multimedia
@@ -24,8 +23,8 @@ DEFINES += LOG_IN_FILE BUILD_BLACKSOUND_LIB
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
DESTDIR = $$BuildRoot/lib DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$BuildRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += ./sounds/*.wav sounds/readme.txt OTHER_FILES += ./sounds/*.wav sounds/readme.txt
RESOURCES += RESOURCES +=
@@ -34,13 +33,13 @@ win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yi
else: COPY = cp -r else: COPY = cp -r
win32 { win32 {
QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/sounds) \ QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/sounds) \
$$shell_path($$OUT_PWD/../../bin/sounds) $$shell_path($$DestRoot/bin/sounds)
} }
else { else {
QMAKE_POST_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) && \ QMAKE_POST_LINK += mkdir -p $$shell_path($$DestRoot/bin) && \
$$COPY $$shell_path($$PWD/sounds) \ $$COPY $$shell_path($$PWD/sounds) \
$$shell_path($$OUT_PWD/../../bin) $$shell_path($$DestRoot/bin)
} }
include ($$SourceRoot/libraries.pri) load(common_post)

8
src/plugins/simulator/fs9/plugin_fs9.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus gui network concurrent xml QT += core dbus gui network concurrent xml
@@ -22,5 +21,6 @@ LIBS += -ldxguid -lole32
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
DESTDIR = $$BuildRoot/bin/plugins/simulator DESTDIR = $$DestRoot/bin/plugins/simulator
include ($$SourceRoot/libraries.pri)
load(common_post)

8
src/plugins/simulator/fscommon/plugin_fscommon.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus concurrent xml QT += core dbus concurrent xml
@@ -20,5 +19,6 @@ INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
DESTDIR = $$BuildRoot/lib DESTDIR = $$DestRoot/lib
include ($$SourceRoot/libraries.pri)
load(common_post)

8
src/plugins/simulator/fsx/plugin_fsx.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus gui network concurrent xml QT += core dbus gui network concurrent xml
@@ -22,5 +21,6 @@ LIBS += -ldxguid -lole32
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
DESTDIR = $$BuildRoot/bin/plugins/simulator DESTDIR = $$DestRoot/bin/plugins/simulator
include ($$SourceRoot/libraries.pri)
load(common_post)

8
src/plugins/simulator/xplane/plugin_xplane.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network QT += core dbus network
@@ -15,5 +14,6 @@ INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
DESTDIR = $$BuildRoot/bin/plugins/simulator DESTDIR = $$DestRoot/bin/plugins/simulator
include ($$SourceRoot/libraries.pri)
load(common_post)

9
src/swiftcore/swiftcore.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network xml multimedia gui svg QT += core dbus network xml multimedia gui svg
@@ -19,9 +18,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
$$SourceRoot/src/blackinput $$SourceRoot/src/blackinput
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$BuildRoot/bin
OTHER_FILES += *.qss *.ico *.rc OTHER_FILES += *.qss *.ico *.rc
RC_FILE = swiftcore.rc RC_FILE = swiftcore.rc
DISTFILES += swiftcore.rc DISTFILES += swiftcore.rc
include ($$SourceRoot/libraries.pri) DESTDIR = $$DestRoot/bin
load(common_post)

9
src/swiftdata/swiftdata.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus network xml multimedia gui svg QT += core dbus network xml multimedia gui svg
CONFIG += console CONFIG += console
@@ -21,9 +20,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
$$SourceRoot/src/blackinput $$SourceRoot/src/blackinput
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$BuildRoot/bin
OTHER_FILES += *.qss *.ico *.rc OTHER_FILES += *.qss *.ico *.rc
RC_FILE = swiftdata.rc RC_FILE = swiftdata.rc
DISTFILES += swiftdata.rc DISTFILES += swiftdata.rc
include ($$SourceRoot/libraries.pri) DESTDIR = $$DestRoot/bin
load(common_post)

10
src/swiftgui_standard/swiftgui_standard.pro
View File

@@ -1,7 +1,7 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core dbus gui svg network xml multimedia QT += core dbus gui svg network xml multimedia
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = swiftgui_std TARGET = swiftgui_std
@@ -27,9 +27,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
$$SourceRoot/src/blackinput $$SourceRoot/src/blackinput
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
DESTDIR = $$BuildRoot/bin
OTHER_FILES += *.qss *.ico *.rc OTHER_FILES += *.qss *.ico *.rc
RC_FILE = swift.rc RC_FILE = swift.rc
DISTFILES += swift.rc DISTFILES += swift.rc
include ($$SourceRoot/libraries.pri) DESTDIR = $$DestRoot/bin
load(common_post)

17
src/xbus/xbus.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core gui widgets dbus network QT += core gui widgets dbus network
@@ -8,6 +7,8 @@ TEMPLATE = lib
CONFIG += shared plugin CONFIG += shared plugin
CONFIG += blackmisc blackcore CONFIG += blackmisc blackcore
INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM
win32 { win32 {
equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64 equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64
equals(WORD_SIZE,32): LIBS += -lXPLM -lXPWidgets equals(WORD_SIZE,32): LIBS += -lXPLM -lXPWidgets
@@ -69,10 +70,10 @@ linux:TARGET = lin
macx:TARGET = mac macx:TARGET = mac
macx { macx {
# a single dylib file contains both 32bit and 64bit binaries # a single dylib file contains both 32bit and 64bit binaries
XBUS_DESTDIR = $$BuildRoot/xbus XBUS_DESTDIR = $$DestRoot/xbus
} else { } else {
equals(WORD_SIZE,64): XBUS_DESTDIR = $$BuildRoot/xbus/64 equals(WORD_SIZE,64): XBUS_DESTDIR = $$DestRoot/xbus/64
equals(WORD_SIZE,32): XBUS_DESTDIR = $$BuildRoot/xbus equals(WORD_SIZE,32): XBUS_DESTDIR = $$DestRoot/xbus
} }
# QMake ignores TARGET_EXT on Unix # QMake ignores TARGET_EXT on Unix
@@ -80,8 +81,4 @@ macx {
else:unix: QMAKE_POST_LINK += mkdir -p $${XBUS_DESTDIR} && cp $$OUT_PWD/lib$${TARGET}.so $$XBUS_DESTDIR/$${TARGET}.xpl else:unix: QMAKE_POST_LINK += mkdir -p $${XBUS_DESTDIR} && cp $$OUT_PWD/lib$${TARGET}.so $$XBUS_DESTDIR/$${TARGET}.xpl
else: DESTDIR = $$XBUS_DESTDIR else: DESTDIR = $$XBUS_DESTDIR
include ($$SourceRoot/libraries.pri) load(common_post)
# TODO refactor .pri files into common_pre.pri and common_post.pri
# to sort out this include order fiasco
INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM

3
swift.pro
View File

@@ -1,5 +1,4 @@
include (config.pri) load(common_pre)
include (build.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered

7
tests/blackcore/test_blackcore.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core testlib dbus network QT += core testlib dbus network
@@ -17,6 +16,6 @@ INCLUDEPATH += . $$SourceRoot/src
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
include ($$SourceRoot/libraries.pri) load(common_post)

7
tests/blackgui/test_blackgui.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core testlib dbus network gui svg QT += core testlib dbus network gui svg
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -17,6 +16,6 @@ INCLUDEPATH += . $$SourceRoot/src
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
include ($$SourceRoot/libraries.pri) load(common_post)

7
tests/blackmisc/test_blackmisc.pro
View File

@@ -1,5 +1,4 @@
include ($$SourceRoot/config.pri) load(common_pre)
include ($$SourceRoot/build.pri)
QT += core testlib dbus network QT += core testlib dbus network
@@ -17,6 +16,6 @@ INCLUDEPATH += . $$SourceRoot/src
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
DESTDIR = $$BuildRoot/bin DESTDIR = $$DestRoot/bin
include ($$SourceRoot/libraries.pri) load(common_post)