mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 04:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Warn when not compiling against the matching libdc version

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-06-22 17:53:53 -07:00
parent d58de37167
commit 63a4a755a3
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/btdiscovery.cpp
View file

@ -94,13 +94,15 @@ BTDiscovery *BTDiscovery::instance()
}
#if defined(BT_SUPPORT)
#if defined(SSRF_CUSTOM_IO)
extern void addBtUuid(QBluetoothUuid uuid);
#endif
extern QHash<QString, QStringList> productList;
extern QStringList vendorList;
void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device)
{
#if defined(SSRF_CUSTOM_IO)
btPairedDevice this_d;
this_d.address = device.address();
this_d.name = device.name();
@ -113,6 +115,7 @@ void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device)
}
btDeviceDiscoveredMain(this_d);
#endif
}
void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)

10
core/libdivecomputer.c
View file

@ -17,6 +17,16 @@
#include <libdivecomputer/version.h>
#include "libdivecomputer.h"
#if !defined(SSRF_LIBDC_VERSION)
#pragma message "You are not compiling against the Subsurface branch of libdivecomputer"
#pragma message "While this may still work, you are missing important features of Subsurface"
#pragma message "Please get it from http://github.com/Subsurface-divelog/libdc Subsurface-branch"
#else
#if !defined(SSRF_CUSTOM_IO)
#pragma message "You are compiling against an older version of the Subsurface branch of libdivecomputer"
#pragma message "which doesn't support the new SSRF_CUSTOM_IO model. Please update libdc"
#endif
#endif
//
// If we have an old libdivecomputer, it doesn't
// have the new DC_TANKINFO bits, but just volume