diff options
| -rw-r--r-- | project/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | project/cmake/modules/FindMDNS.cmake | 47 | ||||
| -rw-r--r-- | project/cmake/treedata/optional/common/mdns.txt | 1 | ||||
| -rw-r--r-- | tools/depends/target/mdnsresponder/makefile.internal | 1 | ||||
| -rw-r--r-- | xbmc/network/mdns/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | xbmc/network/mdns/ZeroconfBrowserMDNS.cpp | 2 | ||||
| -rw-r--r-- | xbmc/network/mdns/ZeroconfMDNS.cpp | 2 | ||||
| -rw-r--r-- | xbmc/system.h | 8 |
8 files changed, 14 insertions, 61 deletions
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index be5c47d25a..43eb7a5ad0 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -115,7 +115,7 @@ endif() # Optional dependencies set(optional_deps MicroHttpd MySqlClient SSH XSLT - Alsa UDEV DBus Avahi MDNS SmbClient CCache + Alsa UDEV DBus Avahi SmbClient CCache PulseAudio VDPAU VAAPI Bluetooth CAP) # Required, dyloaded deps diff --git a/project/cmake/modules/FindMDNS.cmake b/project/cmake/modules/FindMDNS.cmake deleted file mode 100644 index 59416b3d61..0000000000 --- a/project/cmake/modules/FindMDNS.cmake +++ /dev/null @@ -1,47 +0,0 @@ -#.rst: -# FindMDNS -# -------- -# Finds the mDNS library -# -# This will will define the following variables:: -# -# MDNS_FOUND - system has mDNS -# MDNS_INCLUDE_DIRS - the mDNS include directory -# MDNS_LIBRARIES - the mDNS libraries -# MDNS_DEFINITIONS - the mDNS definitions -# -# and the following imported targets:: -# -# MDNS::MDNS - The mDNSlibrary - -find_path(MDNS_INCLUDE_DIR NAMES dmDnsEmbedded.h dns_sd.h) -find_library(MDNS_LIBRARY NAMES mDNSEmbedded dnssd) - -find_path(MDNS_EMBEDDED_INCLUDE_DIR NAMES mDnsEmbedded.h) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(mDNS - REQUIRED_VARS MDNS_LIBRARY MDNS_INCLUDE_DIR) - -if(MDNS_FOUND) - set(MDNS_INCLUDE_DIRS ${MDNS_INCLUDE_DIR}) - set(MDNS_LIBRARIES ${MDNS_LIBRARY}) - set(MDNS_DEFINITIONS -DHAVE_LIBMDNS=1) - if(MDNS_EMBEDDED_INCLUDE_DIR) - list(APPEND MDNS_DEFINITIONS -DHAVE_LIBMDNSEMBEDDED=1) - endif() - - if(NOT TARGET MDNS::MDNS) - add_library(MDNS::MDNS UNKNOWN IMPORTED) - set_target_properties(MDNS::MDNS PROPERTIES - IMPORTED_LOCATION "${MDNS_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${MDNS_INCLUDE_DIR}" - INTERFACE_COMPILE_DEFINITIONS HAVE_LIBMDNS=1) - if(MDNS_EMBEDDED_INCLUDE_DIR) - set_target_properties(MDNS::MDNS PROPERTIES - INTERFACE_COMPILE_DEFINITIONS HAVE_LIBMDNSEMBEDDED=1) - endif() - endif() -endif() - -mark_as_advanced(MDNS_INCLUDE_DIR MDNS_EMBEDDED_INCLUDE_DIR MDNS_LIBRARY) diff --git a/project/cmake/treedata/optional/common/mdns.txt b/project/cmake/treedata/optional/common/mdns.txt deleted file mode 100644 index 9bebb8921d..0000000000 --- a/project/cmake/treedata/optional/common/mdns.txt +++ /dev/null @@ -1 +0,0 @@ -xbmc/network/mdns mdns # MDNS diff --git a/tools/depends/target/mdnsresponder/makefile.internal b/tools/depends/target/mdnsresponder/makefile.internal index fe8e776822..55113c2d31 100644 --- a/tools/depends/target/mdnsresponder/makefile.internal +++ b/tools/depends/target/mdnsresponder/makefile.internal @@ -12,7 +12,6 @@ OBJECTS += mDNSCore/DNSCommon.o mDNSShared/mDNSDebug.o mDNSShared/GenLinkedList. OBJECTS += mDNSCore/uDNS.o mDNSShared/PlatformCommon.o mDNSPosix/mDNSUNP.o OBJECTS += mDNSCore/DNSDigest.o mDNSCore/mDnsEmbedded.o mDNSShared/dnssd_clientlib.o OBJECTS += mDNSCore/CryptoAlg.o -OBJECTS += mDNSCore/anonymous.o all: $(LIB) install: $(LIBDIR)/$(LIB) $(addprefix $(INCDIR)/,$(HEADERS)) diff --git a/xbmc/network/mdns/CMakeLists.txt b/xbmc/network/mdns/CMakeLists.txt index e0b084a886..ed7ba93501 100644 --- a/xbmc/network/mdns/CMakeLists.txt +++ b/xbmc/network/mdns/CMakeLists.txt @@ -1,9 +1,7 @@ -if(MDNS_FOUND) - set(SOURCES ZeroconfBrowserMDNS.cpp - ZeroconfMDNS.cpp) +set(SOURCES ZeroconfBrowserMDNS.cpp + ZeroconfMDNS.cpp) - set(HEADERS ZeroconfBrowserMDNS.h - ZeroconfMDNS.h) +set(HEADERS ZeroconfBrowserMDNS.h + ZeroconfMDNS.h) - core_add_library(network_mdns) -endif() +core_add_library(network_mdns) diff --git a/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp b/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp index fa31cbdf6c..ef8f7dc441 100644 --- a/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp +++ b/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp @@ -35,6 +35,8 @@ #include "platform/win32/WIN32Util.h" #endif //TARGET_WINDOWS +#pragma comment(lib, "dnssd.lib") + extern HWND g_hWnd; diff --git a/xbmc/network/mdns/ZeroconfMDNS.cpp b/xbmc/network/mdns/ZeroconfMDNS.cpp index 17921b76eb..6ffb7adee5 100644 --- a/xbmc/network/mdns/ZeroconfMDNS.cpp +++ b/xbmc/network/mdns/ZeroconfMDNS.cpp @@ -35,6 +35,8 @@ #include <mDnsEmbedded.h> #endif //HAS_MDNS_EMBEDDED +#pragma comment(lib, "dnssd.lib") + extern HWND g_hWnd; void CZeroconfMDNS::Process() diff --git a/xbmc/system.h b/xbmc/system.h index 6f19ffcb45..07dfe87e4a 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -75,12 +75,10 @@ #define HAS_UPNP #endif -#if defined(HAVE_LIBMDNS) +#if defined(HAVE_LIBMDNSEMBEDDED) #define HAS_ZEROCONF #define HAS_MDNS - #if defined(HAVE_LIBMDNSEMBEDDED) - #define HAS_MDNS_EMBEDDED - #endif + #define HAS_MDNS_EMBEDDED #endif /********************** @@ -102,6 +100,8 @@ #define HAS_WEB_SERVER #define HAS_WEB_INTERFACE #define HAS_FILESYSTEM_SMB +#define HAS_ZEROCONF +#define HAS_MDNS #define HAS_AIRTUNES #define HAS_UPNP |