flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-04 08:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Install DBus dependencies alongside XSwiftBus on Windows

Browse Source 
Summary:
XSwiftBus needs to be able to locate dbus-1-3.dll, expat.dll, and dbus-daemon.exe.

We simply need to install them in the same folder as XSwiftBus itself (as we already do with blackmisc.dll).

Then we need to install session.conf in a share/dbus-1 subfolder where dbus-daemon.exe can find it.

Reviewers: rwinklmeier

Reviewed By: rwinklmeier

Subscribers: jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D54
This commit is contained in:
Mathew Sutcliffe
2017-10-16 14:08:51 +01:00
parent 396931804f
commit c6c2c86d30
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xswiftbus/xswiftbus.pro
View File

@@ -99,16 +99,27 @@ INSTALLS += target
dep_target.path = $$PREFIX/$$XSWIFTBUS_DIR dep_target.path = $$PREFIX/$$XSWIFTBUS_DIR
win32 { win32 {
dep_target.files *= $$DestRoot/lib/blackmisc.dll dep_target.files *= $$DestRoot/lib/blackmisc.dll
dep_target.files *= $$DestRoot/bin/dbus-daemon.exe
win32-g++ {
dep_target.files *= $$DestRoot/bin/libdbus-1-3.dll
}
else {
dep_target.files *= $$DestRoot/bin/dbus-1-3.dll
dep_target.files *= $$DestRoot/bin/expat.dll
}
dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Core$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Core$${DLL_DEBUG_SUFFIX}.dll
dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Gui$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Gui$${DLL_DEBUG_SUFFIX}.dll
dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Widgets$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Widgets$${DLL_DEBUG_SUFFIX}.dll
dep_target.files *= $$[QT_INSTALL_BINS]/Qt5DBus$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5DBus$${DLL_DEBUG_SUFFIX}.dll
dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Network$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Network$${DLL_DEBUG_SUFFIX}.dll
dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Xml$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Xml$${DLL_DEBUG_SUFFIX}.dll
win32-g++: dep_target.files *= $$[QT_INSTALL_BINS]/libdbus-1-3.dll
else: dep_target.files *= $$[QT_INSTALL_BINS]/dbus-1-3.dll
dep_target.CONFIG += no_check_exist dep_target.CONFIG += no_check_exist
dbus_share.path = $$PREFIX/$$XSWIFTBUS_DIR/share/dbus-1
dbus_share.files = $$DestRoot/share/dbus-1/session.conf
dbus_share.CONFIG = no_check_exist
INSTALLS += dbus_share
legacy_data_target.path = $$PREFIX/xswiftbus legacy_data_target.path = $$PREFIX/xswiftbus
legacy_data_target.files *= LegacyData legacy_data_target.files *= LegacyData
} else:macx: { } else:macx: {