Skip to content

Q
qgroundcontrol
Commit ab7f1679 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Fixing non Mac OS builds.

parent d653c636
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
QGCExternalLibs.pri
View file @ ab7f1679
...@@ -292,5 +292,7 @@ contains (DEFINES, DISABLE_ZEROCONF) { ...@@ -292,5 +292,7 @@ contains (DEFINES, DISABLE_ZEROCONF) {
} else:MacBuild|iOSBuild { } else:MacBuild|iOSBuild {
message("Including support for Zeroconf (Bonjour)") message("Including support for Zeroconf (Bonjour)")
DEFINES += QGC_ZEROCONF_ENABLED DEFINES += QGC_ZEROCONF_ENABLED
} else {
message("Skipping support for Zeroconf (unsupported platform)")
} }
src/comm/UDPLink.cc
View file @ ab7f1679
...@@ -77,7 +77,9 @@ static QString get_ip_address(const QString& address) ...@@ -77,7 +77,9 @@ static QString get_ip_address(const QString& address)
UDPLink::UDPLink(UDPConfiguration* config) UDPLink::UDPLink(UDPConfiguration* config)
: _socket(NULL) : _socket(NULL)
, _connectState(false) , _connectState(false)
#if defined(QGC_ZEROCONF_ENABLED)
, _dnssServiceRef(NULL) , _dnssServiceRef(NULL)
#endif
{ {
Q_ASSERT(config != NULL); Q_ASSERT(config != NULL);
_config = config; _config = config;
......
src/comm/UDPLink.h
View file @ ab7f1679
...@@ -205,9 +205,10 @@ private: ...@@ -205,9 +205,10 @@ private:
bool _hardwareConnect(); bool _hardwareConnect();
void _restartConnection(); void _restartConnection();
#if defined(QGC_ZEROCONF_ENABLED)
void _registerZeroconf(uint16_t port, const std::string& regType); void _registerZeroconf(uint16_t port, const std::string& regType);
void _deregisterZeroconf(); void _deregisterZeroconf();
#if defined(QGC_ZEROCONF_ENABLED)
DNSServiceRef _dnssServiceRef; DNSServiceRef _dnssServiceRef;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment