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 #403 refactor project files

Browse Source 
* Use source path and build path instead of relative ones
* Unify pre target dependencies in libraries.pri
This commit is contained in:
Roland Winklmeier
2015-04-10 21:33:46 +02:00
parent b042fa068b
commit 793fcbfd15
25 changed files with 195 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.qmake.conf
View File

@@ -1 +1,2 @@
TOPSRCDIR=$$PWD
SourceRoot=$$PWD
BuildRoot=$$shadowed($$PWD)

2
externals.pri
View File

@@ -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

63
libraries.pri
View File

@@ -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
}

15
samples/blackmisc/sample_blackmisc.pro
View File

@@ -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)

17
samples/blackmiscdbus/sample_blackmisc_dbus.pro
View File

@@ -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)

17
samples/blackmiscgeo/sample_geo.pro
View File

@@ -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)

15
samples/blackmiscquantities/sample_quantities_aviation.pro
View File

@@ -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)

3
samples/blackmiscsim/sample_blackmisc_sim.pro
View File

@@ -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

18
samples/cli_client/sample_cli_client.pro
View File

@@ -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)

19
samples/hotkey/sample_hotkey.pro
View File

@@ -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)

18
samples/voiceclient/sample_voice_client.pro
View File

@@ -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)

14
src/blackcore/blackcore.pro
View File

@@ -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)

14
src/blackgui/blackgui.pro
View File

@@ -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)

13
src/blackinput/blackinput.pro
View File

@@ -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)

10
src/blackmisc/blackmisc.pro
View File

@@ -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)

16
src/blacksound/blacksound.pro
View File

@@ -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)

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

@@ -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)

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

@@ -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)

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

@@ -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)

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

@@ -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)

26
src/swiftcore/swiftcore.pro
View File

@@ -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)

26
src/swiftgui_standard/swiftgui_standard.pro
View File

@@ -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)

24
src/xbus/xbus.pro
View File

@@ -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

17
tests/blackcore/test_blackcore.pro
View File

@@ -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)

15
tests/blackmisc/test_blackmisc.pro
View File

@@ -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)