diff --git a/.qmake.conf b/.qmake.conf index 02ed81b06..8305af792 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,2 @@ -TOPSRCDIR=$$PWD +SourceRoot=$$PWD +BuildRoot=$$shadowed($$PWD) diff --git a/externals.pri b/externals.pri index abe21ce2f..888a175bb 100644 --- a/externals.pri +++ b/externals.pri @@ -12,7 +12,7 @@ isEmpty(EXTERNALDIR) { # if no env variable is set, we use the standard path in the client folder. isEmpty(EXTERNALDIR) { - EXTERNALDIR = $$TOPSRCDIR/externals + EXTERNALDIR = $$SourceRoot/externals } # Test the folder if it exists and has a include subfolder diff --git a/libraries.pri b/libraries.pri index 58de4146c..c4e3a6dc0 100644 --- a/libraries.pri +++ b/libraries.pri @@ -1,38 +1,83 @@ include (externals.pri) -LIBS *= -L../../lib -L../../../lib -L../../../../lib +LIBS *= -L$$BuildRoot/lib + +unix { + # Set the rpath-link to find dependent shared libraries when linking + # Note: This does not add any rpath into the binaries. + LIBS += -Wl,-rpath-link,$$BuildRoot/lib +} blackgui { - LIBS += -lblackgui + contains(BLACK_CONFIG, Static) { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackgui.lib + else: PRE_TARGETDEPS += $$BuildRoot/lib/libblackgui.a + } else { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackgui.lib + win32-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackgui.a + linux-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackgui.so + macx-clang: PRE_TARGETDEPS += $$BuildRoot/lib/libblackgui.dylib + } + + LIBS *= -lblackgui } blackcore { - LIBS += -lblackcore -lvatlib2 + contains(BLACK_CONFIG, Static) { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackcore.lib + else: PRE_TARGETDEPS += $$BuildRoot/lib/libblackcore.a + } else { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackcore.lib + win32-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackcore.a + linux-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackcore.so + macx-clang: PRE_TARGETDEPS += $$BuildRoot/lib/libblackcore.dylib + } + + LIBS *= -lblackcore -lvatlib2 win32 { contains(BLACK_CONFIG, FSX) { - LIBS += -lSimConnect - LIBS += -lFSUIPC_User + LIBS *= -lSimConnect + LIBS *= -lFSUIPC_User } } } blacksound { - LIBS += -lblacksound + LIBS *= -lblacksound } blackinput { - LIBS += -lblackinput + contains(BLACK_CONFIG, Static) { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackinput.lib + else: PRE_TARGETDEPS += $$BuildRoot/lib/libblackinput.a + } else { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackinput.lib + win32-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackinput.a + linux-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackinput.so + macx-clang: PRE_TARGETDEPS += $$BuildRoot/lib/libblackinput.dylib + } + + LIBS *= -lblackinput macx { LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit } win32 { - LIBS += -ldxguid -lole32 -ldinput8 -lUser32 + LIBS *= -ldxguid -lole32 -ldinput8 -lUser32 } } blackmisc { - LIBS += -lblackmisc + contains(BLACK_CONFIG, Static) { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackmisc.lib + else: PRE_TARGETDEPS += $$BuildRoot/lib/libblackmisc.a + } else { + win32-msvc*: PRE_TARGETDEPS += $$BuildRoot/lib/blackmisc.lib + win32-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackmisc.a + linux-g++*: PRE_TARGETDEPS += $$BuildRoot/lib/libblackmisc.so + macx-clang: PRE_TARGETDEPS += $$BuildRoot/lib/libblackmisc.dylib + } + LIBS *= -lblackmisc } diff --git a/samples/blackmisc/sample_blackmisc.pro b/samples/blackmisc/sample_blackmisc.pro index c8905e11f..6efd9ee51 100644 --- a/samples/blackmisc/sample_blackmisc.pro +++ b/samples/blackmisc/sample_blackmisc.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network @@ -10,17 +10,14 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc -DEPENDPATH += . ../../src/blackmisc -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src/blackmisc +INCLUDEPATH += . $$SourceRoot/src -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - -DESTDIR = ../../bin +DESTDIR = $$BuildRoot/bin HEADERS += *.h SOURCES += *.cpp OTHER_FILES += -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/samples/blackmiscdbus/sample_blackmisc_dbus.pro b/samples/blackmiscdbus/sample_blackmisc_dbus.pro index 08f704d1e..cf9c891e8 100644 --- a/samples/blackmiscdbus/sample_blackmisc_dbus.pro +++ b/samples/blackmiscdbus/sample_blackmisc_dbus.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network @@ -10,19 +10,14 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc blackcore -DEPENDPATH += . ../../src/blackmisc ../../src/blackcore -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src/blackmisc $$SourceRoot/src/blackcore +INCLUDEPATH += . $$SourceRoot/src -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a - -DESTDIR = ../../bin +DESTDIR = $$BuildRoot/bin HEADERS += *.h SOURCES += *.cpp OTHER_FILES += *.txt *.xml -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/samples/blackmiscgeo/sample_geo.pro b/samples/blackmiscgeo/sample_geo.pro index fb8d943fc..d701ca291 100644 --- a/samples/blackmiscgeo/sample_geo.pro +++ b/samples/blackmiscgeo/sample_geo.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network @@ -10,15 +10,12 @@ CONFIG += blackmisc blackcore TEMPLATE = app -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src - -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - -DESTDIR = ../../bin +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -include (../../libraries.pri) +DESTDIR = $$BuildRoot/bin + +include ($$SourceRoot/libraries.pri) diff --git a/samples/blackmiscquantities/sample_quantities_aviation.pro b/samples/blackmiscquantities/sample_quantities_aviation.pro index e6d2f2d65..fffb9ec88 100644 --- a/samples/blackmiscquantities/sample_quantities_aviation.pro +++ b/samples/blackmiscquantities/sample_quantities_aviation.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network @@ -10,15 +10,12 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc -DEPENDPATH += . ../../src/blackmisc -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src/blackmisc +INCLUDEPATH += . $$SourceRoot/src -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - -DESTDIR = ../../bin +DESTDIR = $$BuildRoot/bin HEADERS += *.h SOURCES += *.cpp -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/samples/blackmiscsim/sample_blackmisc_sim.pro b/samples/blackmiscsim/sample_blackmisc_sim.pro index a249ea90e..595a71216 100644 --- a/samples/blackmiscsim/sample_blackmisc_sim.pro +++ b/samples/blackmiscsim/sample_blackmisc_sim.pro @@ -13,9 +13,6 @@ CONFIG += blackmisc blacksim DEPENDPATH += . ../../src/blackmisc INCLUDEPATH += . ../../src -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - DESTDIR = ../../bin HEADERS += *.h diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro index 1b47941ac..d4f049890 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cli_client/sample_cli_client.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network @@ -10,18 +10,12 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc blackcore -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib +DESTDIR = $$BuildRoot/bin -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a - -DESTDIR = ../../bin - -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/samples/hotkey/sample_hotkey.pro b/samples/hotkey/sample_hotkey.pro index 64696a423..3645eec9c 100644 --- a/samples/hotkey/sample_hotkey.pro +++ b/samples/hotkey/sample_hotkey.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core gui dbus network @@ -11,19 +11,12 @@ TEMPLATE = app CONFIG -= app_bundle CONFIG += blackmisc blackinput blackcore -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib \ - ../../lib/blackinput.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a \ - ../../lib/libblackinput.a +DESTDIR = $$BuildRoot/bin -DESTDIR = ../../bin - -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/samples/voiceclient/sample_voice_client.pro b/samples/voiceclient/sample_voice_client.pro index 8d1e6b4ac..14d9bfcb7 100644 --- a/samples/voiceclient/sample_voice_client.pro +++ b/samples/voiceclient/sample_voice_client.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network multimedia QT -= gui @@ -11,18 +11,12 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc blacksound blackcore -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib \ - ../../lib/blacksound.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a \ - ../../lib/libblacksound.a -DESTDIR = ../../bin +DESTDIR = $$BuildRoot/bin -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index b2c4f526b..ca0d4c740 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) # GUI is required for the matrix classes # Network for host info etc. @@ -8,7 +8,7 @@ QT += network dbus xml multimedia TARGET = blackcore TEMPLATE = lib CONFIG += staticlib -CONFIG += blackmisc blackinput +CONFIG += blackmisc blackinput blacksound INCLUDEPATH += .. DEPENDPATH += . .. @@ -23,11 +23,9 @@ DEFINES += LOG_IN_FILE HEADERS += *.h SOURCES += *.cpp -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksound.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksound.a - -DESTDIR = ../../lib +DESTDIR = $$BuildRoot/lib +DLLDESTDIR = $$BuildRoot/bin OTHER_FILES += readme.txt *.xml -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index bbe3ac7fb..206b7a24b 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += network dbus gui svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -19,10 +19,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblackcore.a - - HEADERS += *.h SOURCES += *.cpp HEADERS += $$PWD/models/*.h @@ -44,7 +40,9 @@ win32 { RESOURCES += -DESTDIR = ../../lib +DESTDIR = $$BuildRoot/lib +DLLDESTDIR = $$BuildRoot/bin + OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yi @@ -60,4 +58,4 @@ else { $$shell_path($$OUT_PWD/../../bin) } -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/blackinput/blackinput.pro b/src/blackinput/blackinput.pro index 8fd7c1171..6a233bcc8 100644 --- a/src/blackinput/blackinput.pro +++ b/src/blackinput/blackinput.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += network dbus gui multimedia @@ -18,9 +18,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - HEADERS += *.h SOURCES += *.cpp @@ -40,8 +37,10 @@ macx { OBJECTIVE_SOURCES += $$PWD/osx/*.mm } -DESTDIR = ../../lib +DESTDIR = $$BuildRoot/lib +DLLDESTDIR = $$BuildRoot/bin + OTHER_FILES += RESOURCES += -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index b2ecc8b85..a9c97be35 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += network dbus xml @@ -47,7 +47,9 @@ SOURCES += *.cpp \ $$PWD/simulation/fscommon\*.cpp \ $$PWD/simulation/fsx\*.cpp -DESTDIR = ../../lib +DESTDIR = $$BuildRoot/lib +DLLDESTDIR = $$BuildRoot/bin + OTHER_FILES += $$TRANSLATIONS readme.txt -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index 126275e44..08c982e16 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -1,12 +1,12 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += network dbus gui multimedia TARGET = blacksound TEMPLATE = lib CONFIG += staticlib -CONFIG += blackmisc +CONFIG += blackmisc INCLUDEPATH += .. DEPENDPATH += . .. @@ -18,12 +18,12 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - HEADERS += *.h SOURCES += *.cpp -DESTDIR = ../../lib + +DESTDIR = $$BuildRoot/lib +DLLDESTDIR = $$BuildRoot/bin + OTHER_FILES += ./sounds/*.wav sounds/readme.txt RESOURCES += @@ -40,4 +40,4 @@ else { $$shell_path($$OUT_PWD/../../bin) } -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/plugins/simulator/fs9/plugin_fs9.pro b/src/plugins/simulator/fs9/plugin_fs9.pro index 77cf04bde..f7a7306a1 100644 --- a/src/plugins/simulator/fs9/plugin_fs9.pro +++ b/src/plugins/simulator/fs9/plugin_fs9.pro @@ -1,5 +1,5 @@ -include (../../../../config.pri) -include (../../../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus gui network concurrent xml @@ -14,18 +14,13 @@ LIBS += -lsimulator_fscommon -lFSUIPC_User -luuid # required for FSUIPC win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib -DEPENDPATH += . ../../../../src -INCLUDEPATH += . ../../../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src LIBS += -ldxguid -lole32 SOURCES += *.cpp HEADERS += *.h -win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \ - ../../../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \ - ../../../../lib/libblackcore.a - -DESTDIR = ../../../../bin/plugins/simulator -include (../../../../libraries.pri) +DESTDIR = $$BuildRoot/bin/plugins/simulator +include ($$SourceRoot/libraries.pri) diff --git a/src/plugins/simulator/fscommon/plugin_fscommon.pro b/src/plugins/simulator/fscommon/plugin_fscommon.pro index 5be6fb989..124ac9ba4 100644 --- a/src/plugins/simulator/fscommon/plugin_fscommon.pro +++ b/src/plugins/simulator/fscommon/plugin_fscommon.pro @@ -1,5 +1,5 @@ -include (../../../../config.pri) -include (../../../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus concurrent xml @@ -14,17 +14,11 @@ LIBS += -lFSUIPC_User # required for FSUIPC win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib -DEPENDPATH += . ../../../../src -INCLUDEPATH += . ../../../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \ - ../../../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \ - ../../../../lib/libblackcore.a -DESTDIR = ../../lib - -DESTDIR = ../../../../lib -include (../../../../libraries.pri) +DESTDIR = $$BuildRoot/lib +include ($$SourceRoot/libraries.pri) diff --git a/src/plugins/simulator/fsx/plugin_fsx.pro b/src/plugins/simulator/fsx/plugin_fsx.pro index e9e6db7db..2c3fbef2e 100644 --- a/src/plugins/simulator/fsx/plugin_fsx.pro +++ b/src/plugins/simulator/fsx/plugin_fsx.pro @@ -1,5 +1,5 @@ -include (../../../../config.pri) -include (../../../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus gui network concurrent xml @@ -14,18 +14,13 @@ LIBS += -lsimulator_fscommon -lSimConnect -lFSUIPC_User # required for FSUIPC win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib -DEPENDPATH += . ../../../../src -INCLUDEPATH += . ../../../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src LIBS += -ldxguid -lole32 SOURCES += *.cpp HEADERS += *.h -win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \ - ../../../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \ - ../../../../lib/libblackcore.a - -DESTDIR = ../../../../bin/plugins/simulator -include (../../../../libraries.pri) +DESTDIR = $$BuildRoot/bin/plugins/simulator +include ($$SourceRoot/libraries.pri) diff --git a/src/plugins/simulator/xplane/plugin_xplane.pro b/src/plugins/simulator/xplane/plugin_xplane.pro index a178c7d0b..8521c2b48 100644 --- a/src/plugins/simulator/xplane/plugin_xplane.pro +++ b/src/plugins/simulator/xplane/plugin_xplane.pro @@ -1,5 +1,5 @@ -include (../../../../config.pri) -include (../../../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus network @@ -9,15 +9,11 @@ TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore -DEPENDPATH += . ../../../../src -INCLUDEPATH += . ../../../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h -#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib -#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackcore.lib - -DESTDIR = ../../../../bin/plugins/simulator - -include (../../../../libraries.pri) +DESTDIR = $$BuildRoot/bin/plugins/simulator +include ($$SourceRoot/libraries.pri) diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro index 2ebaeb1c1..f67e3ef11 100644 --- a/src/swiftcore/swiftcore.pro +++ b/src/swiftcore/swiftcore.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) # widgets required for icon QT += core dbus network xml multimedia gui @@ -12,25 +12,17 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc blacksound blackinput blackcore -DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore ../../src/blackinput -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src/blackmisc \ + $$SourceRoot/src/blacksound \ + $$SourceRoot/src/blackcore \ + $$SourceRoot/src/blackinput -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blacksound.lib \ - ../../lib/blackcore.lib \ - ../../lib/blackinput.lib - -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblacksound.a \ - ../../lib/libblackcore.a \ - ../../lib/libblackinput.a - - -DESTDIR = ../../bin +INCLUDEPATH += . $$SourceRoot/src HEADERS += *.h SOURCES += *.cpp OTHER_FILES += swiftcore.ico swiftcore.rc win32: RC_FILE = swiftcore.rc -include (../../libraries.pri) +DESTDIR = $$BuildRoot/bin +include ($$SourceRoot/libraries.pri) diff --git a/src/swiftgui_standard/swiftgui_standard.pro b/src/swiftgui_standard/swiftgui_standard.pro index 8eb52c65e..d9cf52f3f 100644 --- a/src/swiftgui_standard/swiftgui_standard.pro +++ b/src/swiftgui_standard/swiftgui_standard.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core dbus gui svg network xml multimedia greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -20,23 +20,15 @@ macx { QMAKE_BUNDLE_DATA += deployment } -DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blackcore ../../src/blackinput -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src/blackmisc \ + $$SourceRoot/src/blacksound \ + $$SourceRoot/src/blackcore \ + $$SourceRoot/src/blackinput -DESTDIR = ../../bin +INCLUDEPATH += . $$SourceRoot/src -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackgui.lib \ - ../../lib/blacksound.lib \ - ../../lib/blackcore.lib \ - ../../lib/blackinput.lib - -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackgui.a \ - ../../lib/libblacksound.a \ - ../../lib/libblackcore.a \ - ../../lib/libblackinput.a +DESTDIR = $$BuildRoot/bin OTHER_FILES += *.qss -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro index 0018ac9a5..64f6c79b5 100644 --- a/src/xbus/xbus.pro +++ b/src/xbus/xbus.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core gui widgets dbus network @@ -21,8 +21,8 @@ else:unix { QMAKE_LFLAGS += -shared -rdynamic -nodefaultlibs -undefined_warning -Wl,--version-script=$$PWD/xbus.map } -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h @@ -50,11 +50,6 @@ else: LIBS += -lpng -lz win32-msvc*: DEFINES += _CRT_SECURE_NO_WARNINGS - -#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib -#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackcore.lib - - # Required by X-Plane SDK and libxplanemp win32:DEFINES += IBM=1 linux:DEFINES += LIN=1 @@ -73,11 +68,10 @@ linux:TARGET = lin macx:TARGET = mac macx { # a single dylib file contains both 32bit and 64bit binaries - XBUS_DESTDIR = ../../xbus -} -else { - equals(WORD_SIZE,64): XBUS_DESTDIR = ../../xbus/64 - equals(WORD_SIZE,32): XBUS_DESTDIR = ../../xbus + XBUS_DESTDIR = $$BuildRoot/xbus +} else { + equals(WORD_SIZE,64): XBUS_DESTDIR = $$BuildRoot/xbus/64 + equals(WORD_SIZE,32): XBUS_DESTDIR = $$BuildRoot/xbus } # QMake ignores TARGET_EXT on Unix @@ -85,7 +79,7 @@ else { else:unix: QMAKE_POST_LINK += mkdir -p $${XBUS_DESTDIR} && cp $$OUT_PWD/lib$${TARGET}.so $$XBUS_DESTDIR/$${TARGET}.xpl else: DESTDIR = $$XBUS_DESTDIR -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) # TODO refactor .pri files into common_pre.pri and common_post.pri # to sort out this include order fiasco diff --git a/tests/blackcore/test_blackcore.pro b/tests/blackcore/test_blackcore.pro index 74b1b7e9d..3c5e7f913 100644 --- a/tests/blackcore/test_blackcore.pro +++ b/tests/blackcore/test_blackcore.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core testlib dbus network @@ -11,17 +11,12 @@ CONFIG -= app_bundle CONFIG += blackmisc blackcore CONFIG += testcase -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src HEADERS += *.h SOURCES += *.cpp -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a +DESTDIR = $$BuildRoot/bin -DESTDIR = ../../bin - -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri) diff --git a/tests/blackmisc/test_blackmisc.pro b/tests/blackmisc/test_blackmisc.pro index 8d78403c5..f76d74c5c 100644 --- a/tests/blackmisc/test_blackmisc.pro +++ b/tests/blackmisc/test_blackmisc.pro @@ -1,5 +1,5 @@ -include (../../config.pri) -include (../../build.pri) +include ($$SourceRoot/config.pri) +include ($$SourceRoot/build.pri) QT += core testlib dbus network @@ -11,15 +11,12 @@ CONFIG -= app_bundle CONFIG += blackmisc CONFIG += testcase -DEPENDPATH += . ../../src -INCLUDEPATH += . ../../src +DEPENDPATH += . $$SourceRoot/src +INCLUDEPATH += . $$SourceRoot/src HEADERS += *.h SOURCES += *.cpp -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a +DESTDIR = $$BuildRoot/bin -DESTDIR = ../../bin - -include (../../libraries.pri) +include ($$SourceRoot/libraries.pri)