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

2026-03-22 23:05:36 +08:00 · 2015-10-06 23:36:49 +01:00
parent dbb5a240da
commit 6b75de0b3f
24 changed files with 121 additions and 115 deletions
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- a/swift.pro
+++ b/swift.pro
@@ -1,5 +1,4 @@
-include (config.pri)
-include (build.pri)
+load(common_pre)

 TEMPLATE = subdirs
 CONFIG += ordered
--- 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)
--- 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)
--- 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)