diff --git a/docs/doxygen.pro b/docs/doxygen.pro index 2741b5639..af55e1921 100644 --- a/docs/doxygen.pro +++ b/docs/doxygen.pro @@ -1,3 +1,5 @@ +load(common_pre) + TEMPLATE = lib CONFIG += staticlib CONFIG -= qt @@ -6,15 +8,15 @@ DOXYFILE = Doxyfile.qmake DOXY_INPUT = . win32-g++ { - doxy.commands = set DOXY_SRC_ROOT=$$PWD\\..\\src & \ + doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \ doxygen $$PWD/$$DOXYFILE } else:win32 { - doxy.commands = set DOXY_SRC_ROOT=$$PWD\\..\\src & \ + doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \ doxygen $$PWD\\$$DOXYFILE } else { - doxy.commands = DOXY_SRC_ROOT="$$PWD/../src" \ + doxy.commands = DOXY_SRC_ROOT="$$SourceRoot/src" \ doxygen $$PWD/$$DOXYFILE } doxy.CONFIG = no_link target_predeps @@ -24,3 +26,5 @@ doxy.name = DOXY doxy.output = html/index.html QMAKE_EXTRA_COMPILERS += doxy OTHER_FILES += Doxyfile.qmake + +load(common_post) diff --git a/samples/blackmisc/sample_blackmisc.pro b/samples/blackmisc/sample_blackmisc.pro index 6efd9ee51..4936ba7cd 100644 --- a/samples/blackmisc/sample_blackmisc.pro +++ b/samples/blackmisc/sample_blackmisc.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network @@ -13,11 +12,11 @@ CONFIG += blackmisc DEPENDPATH += . $$SourceRoot/src/blackmisc INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin HEADERS += *.h SOURCES += *.cpp OTHER_FILES += -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/samples/blackmiscdbus/sample_blackmisc_dbus.pro b/samples/blackmiscdbus/sample_blackmisc_dbus.pro index cf9c891e8..6eb850d4d 100644 --- a/samples/blackmiscdbus/sample_blackmisc_dbus.pro +++ b/samples/blackmiscdbus/sample_blackmisc_dbus.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network @@ -13,11 +12,11 @@ CONFIG += blackmisc blackcore DEPENDPATH += . $$SourceRoot/src/blackmisc $$SourceRoot/src/blackcore INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin HEADERS += *.h SOURCES += *.cpp OTHER_FILES += *.txt *.xml -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/samples/blackmiscquantities/sample_quantities_aviation.pro b/samples/blackmiscquantities/sample_quantities_aviation.pro index fffb9ec88..f21f9ad86 100644 --- a/samples/blackmiscquantities/sample_quantities_aviation.pro +++ b/samples/blackmiscquantities/sample_quantities_aviation.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network @@ -13,9 +12,9 @@ CONFIG += blackmisc DEPENDPATH += . $$SourceRoot/src/blackmisc INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin HEADERS += *.h SOURCES += *.cpp -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/samples/blackmiscsim/sample_blackmisc_sim.pro b/samples/blackmiscsim/sample_blackmisc_sim.pro index 595a71216..cfded4393 100644 --- a/samples/blackmiscsim/sample_blackmisc_sim.pro +++ b/samples/blackmiscsim/sample_blackmisc_sim.pro @@ -1,5 +1,4 @@ -include (../../config.pri) -include (../../build.pri) +load(common_pre) QT += core dbus network xml @@ -13,9 +12,9 @@ CONFIG += blackmisc blacksim DEPENDPATH += . ../../src/blackmisc INCLUDEPATH += . ../../src -DESTDIR = ../../bin +DESTDIR = $$DestRoot/bin HEADERS += *.h SOURCES += *.cpp -include (../../libraries.pri) +load(common_post) diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro index d4f049890..73570b829 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cli_client/sample_cli_client.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network @@ -16,6 +15,6 @@ INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/samples/hotkey/sample_hotkey.pro b/samples/hotkey/sample_hotkey.pro index 165501fac..9fe400439 100644 --- a/samples/hotkey/sample_hotkey.pro +++ b/samples/hotkey/sample_hotkey.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core gui dbus network @@ -16,6 +15,6 @@ INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index 1d09a729f..3531e6043 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) # GUI is required for the matrix classes # Network for host info etc. @@ -31,9 +30,9 @@ SOURCES += $$PWD/settings/*.cpp LIBS *= -lvatlib2 -DESTDIR = $$BuildRoot/lib -DLLDESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/lib +DLLDESTDIR = $$DestRoot/bin OTHER_FILES += readme.txt *.xml -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index f72631b27..432ef9380 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += network dbus gui svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -51,8 +50,8 @@ win32 { RESOURCES += -DESTDIR = $$BuildRoot/lib -DLLDESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/lib +DLLDESTDIR = $$DestRoot/bin 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 win32 { - QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/qss) \ - $$shell_path($$OUT_PWD/../../bin/qss) + QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/qss) \ + $$shell_path($$DestRoot/bin/qss) } else { - QMAKE_POST_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) && \ - $$COPY $$shell_path($$PWD/qss) \ - $$shell_path($$OUT_PWD/../../bin) + QMAKE_POST_LINK += mkdir -p $$shell_path($$DestRoot/bin) && \ + $$COPY $$shell_path($$PWD/qss) \ + $$shell_path($$DestRoot/bin) } -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/src/blackinput/blackinput.pro b/src/blackinput/blackinput.pro index a8bbd9245..e71f02b65 100644 --- a/src/blackinput/blackinput.pro +++ b/src/blackinput/blackinput.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += network dbus gui widgets multimedia @@ -43,10 +42,10 @@ macx { LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit } -DESTDIR = $$BuildRoot/lib -DLLDESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/lib +DLLDESTDIR = $$DestRoot/bin OTHER_FILES += RESOURCES += -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 4fa073f6c..c766a5e78 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -1,6 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) -include ($$SourceRoot/resources/swift_resources.pri) +load(common_pre) QT += network dbus xml @@ -54,9 +52,26 @@ SOURCES += *.cpp \ $$PWD/simulation/fsx/*.cpp \ $$PWD/weather/*.cpp -DESTDIR = $$BuildRoot/lib -DLLDESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/lib +DLLDESTDIR = $$DestRoot/bin 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) diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index f6242c436..2aaea9a7c 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += network dbus gui multimedia @@ -24,8 +23,8 @@ DEFINES += LOG_IN_FILE BUILD_BLACKSOUND_LIB HEADERS += *.h SOURCES += *.cpp -DESTDIR = $$BuildRoot/lib -DLLDESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/lib +DLLDESTDIR = $$DestRoot/bin OTHER_FILES += ./sounds/*.wav sounds/readme.txt RESOURCES += @@ -34,13 +33,13 @@ win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yi else: COPY = cp -r win32 { - QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/sounds) \ - $$shell_path($$OUT_PWD/../../bin/sounds) + QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/sounds) \ + $$shell_path($$DestRoot/bin/sounds) } else { - QMAKE_POST_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) && \ - $$COPY $$shell_path($$PWD/sounds) \ - $$shell_path($$OUT_PWD/../../bin) + QMAKE_POST_LINK += mkdir -p $$shell_path($$DestRoot/bin) && \ + $$COPY $$shell_path($$PWD/sounds) \ + $$shell_path($$DestRoot/bin) } -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/src/plugins/simulator/fs9/plugin_fs9.pro b/src/plugins/simulator/fs9/plugin_fs9.pro index f7a7306a1..838461aa4 100644 --- a/src/plugins/simulator/fs9/plugin_fs9.pro +++ b/src/plugins/simulator/fs9/plugin_fs9.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus gui network concurrent xml @@ -22,5 +21,6 @@ LIBS += -ldxguid -lole32 SOURCES += *.cpp HEADERS += *.h -DESTDIR = $$BuildRoot/bin/plugins/simulator -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/bin/plugins/simulator + +load(common_post) diff --git a/src/plugins/simulator/fscommon/plugin_fscommon.pro b/src/plugins/simulator/fscommon/plugin_fscommon.pro index 124ac9ba4..48ce9f47d 100644 --- a/src/plugins/simulator/fscommon/plugin_fscommon.pro +++ b/src/plugins/simulator/fscommon/plugin_fscommon.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus concurrent xml @@ -20,5 +19,6 @@ INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -DESTDIR = $$BuildRoot/lib -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/lib + +load(common_post) diff --git a/src/plugins/simulator/fsx/plugin_fsx.pro b/src/plugins/simulator/fsx/plugin_fsx.pro index 2c3fbef2e..982ea97d7 100644 --- a/src/plugins/simulator/fsx/plugin_fsx.pro +++ b/src/plugins/simulator/fsx/plugin_fsx.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus gui network concurrent xml @@ -22,5 +21,6 @@ LIBS += -ldxguid -lole32 SOURCES += *.cpp HEADERS += *.h -DESTDIR = $$BuildRoot/bin/plugins/simulator -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/bin/plugins/simulator + +load(common_post) diff --git a/src/plugins/simulator/xplane/plugin_xplane.pro b/src/plugins/simulator/xplane/plugin_xplane.pro index 8521c2b48..f86fa246c 100644 --- a/src/plugins/simulator/xplane/plugin_xplane.pro +++ b/src/plugins/simulator/xplane/plugin_xplane.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network @@ -15,5 +14,6 @@ INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -DESTDIR = $$BuildRoot/bin/plugins/simulator -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/bin/plugins/simulator + +load(common_post) diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro index 4e0995fb0..790ea62d7 100644 --- a/src/swiftcore/swiftcore.pro +++ b/src/swiftcore/swiftcore.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network xml multimedia gui svg @@ -19,9 +18,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \ $$SourceRoot/src/blackinput INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$BuildRoot/bin + OTHER_FILES += *.qss *.ico *.rc RC_FILE = swiftcore.rc DISTFILES += swiftcore.rc -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/bin + +load(common_post) diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro index a7a2b3a32..6d757d648 100644 --- a/src/swiftdata/swiftdata.pro +++ b/src/swiftdata/swiftdata.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus network xml multimedia gui svg CONFIG += console @@ -21,9 +20,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \ $$SourceRoot/src/blackinput INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$BuildRoot/bin + OTHER_FILES += *.qss *.ico *.rc RC_FILE = swiftdata.rc DISTFILES += swiftdata.rc -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/bin + +load(common_post) diff --git a/src/swiftgui_standard/swiftgui_standard.pro b/src/swiftgui_standard/swiftgui_standard.pro index 2441b2dfe..fd1692f09 100644 --- a/src/swiftgui_standard/swiftgui_standard.pro +++ b/src/swiftgui_standard/swiftgui_standard.pro @@ -1,7 +1,7 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core dbus gui svg network xml multimedia + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = swiftgui_std @@ -27,9 +27,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \ $$SourceRoot/src/blackinput INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$BuildRoot/bin + OTHER_FILES += *.qss *.ico *.rc RC_FILE = swift.rc DISTFILES += swift.rc -include ($$SourceRoot/libraries.pri) +DESTDIR = $$DestRoot/bin + +load(common_post) diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro index 1b870cac8..64f65701d 100644 --- a/src/xbus/xbus.pro +++ b/src/xbus/xbus.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core gui widgets dbus network @@ -8,6 +7,8 @@ TEMPLATE = lib CONFIG += shared plugin CONFIG += blackmisc blackcore +INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM + win32 { equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64 equals(WORD_SIZE,32): LIBS += -lXPLM -lXPWidgets @@ -69,10 +70,10 @@ linux:TARGET = lin macx:TARGET = mac macx { # a single dylib file contains both 32bit and 64bit binaries - XBUS_DESTDIR = $$BuildRoot/xbus + XBUS_DESTDIR = $$DestRoot/xbus } else { - equals(WORD_SIZE,64): XBUS_DESTDIR = $$BuildRoot/xbus/64 - equals(WORD_SIZE,32): XBUS_DESTDIR = $$BuildRoot/xbus + equals(WORD_SIZE,64): XBUS_DESTDIR = $$DestRoot/xbus/64 + equals(WORD_SIZE,32): XBUS_DESTDIR = $$DestRoot/xbus } # 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: DESTDIR = $$XBUS_DESTDIR -include ($$SourceRoot/libraries.pri) - -# TODO refactor .pri files into common_pre.pri and common_post.pri -# to sort out this include order fiasco -INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM +load(common_post) diff --git a/swift.pro b/swift.pro index e2587735c..f3f3756cb 100644 --- a/swift.pro +++ b/swift.pro @@ -1,5 +1,4 @@ -include (config.pri) -include (build.pri) +load(common_pre) TEMPLATE = subdirs CONFIG += ordered diff --git a/tests/blackcore/test_blackcore.pro b/tests/blackcore/test_blackcore.pro index 3c5e7f913..195a1593d 100644 --- a/tests/blackcore/test_blackcore.pro +++ b/tests/blackcore/test_blackcore.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core testlib dbus network @@ -17,6 +16,6 @@ INCLUDEPATH += . $$SourceRoot/src HEADERS += *.h SOURCES += *.cpp -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/tests/blackgui/test_blackgui.pro b/tests/blackgui/test_blackgui.pro index 0d6985453..e1440da1f 100644 --- a/tests/blackgui/test_blackgui.pro +++ b/tests/blackgui/test_blackgui.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core testlib dbus network gui svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -17,6 +16,6 @@ INCLUDEPATH += . $$SourceRoot/src HEADERS += *.h SOURCES += *.cpp -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin -include ($$SourceRoot/libraries.pri) +load(common_post) diff --git a/tests/blackmisc/test_blackmisc.pro b/tests/blackmisc/test_blackmisc.pro index f76d74c5c..932db871c 100644 --- a/tests/blackmisc/test_blackmisc.pro +++ b/tests/blackmisc/test_blackmisc.pro @@ -1,5 +1,4 @@ -include ($$SourceRoot/config.pri) -include ($$SourceRoot/build.pri) +load(common_pre) QT += core testlib dbus network @@ -17,6 +16,6 @@ INCLUDEPATH += . $$SourceRoot/src HEADERS += *.h SOURCES += *.cpp -DESTDIR = $$BuildRoot/bin +DESTDIR = $$DestRoot/bin -include ($$SourceRoot/libraries.pri) +load(common_post)