changeset 17734:b87114cdd6ae

More minor changes related to bonjour on win32.
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 05 Jun 2007 04:02:22 +0000
parents d7b50cac1c7a
children a232532833e8
files libpurple/protocols/bonjour/Makefile.mingw libpurple/protocols/bonjour/issues.txt libpurple/protocols/bonjour/mdns_common.h libpurple/win32/global.mak
diffstat 4 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/bonjour/Makefile.mingw	Tue Jun 05 03:38:22 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.mingw	Tue Jun 05 04:02:22 2007 +0000
@@ -20,6 +20,8 @@
 endif
 endif
 
+CFLAGS += -DUSE_BONJOUR_APPLE
+
 ##
 ## INCLUDE PATHS
 ##
--- a/libpurple/protocols/bonjour/issues.txt	Tue Jun 05 03:38:22 2007 +0000
+++ b/libpurple/protocols/bonjour/issues.txt	Tue Jun 05 04:02:22 2007 +0000
@@ -6,4 +6,3 @@
 * Avatars
 * File transfers
 * Typing notifications
-* Check if it works on win32
--- a/libpurple/protocols/bonjour/mdns_common.h	Tue Jun 05 03:38:22 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_common.h	Tue Jun 05 04:02:22 2007 +0000
@@ -19,8 +19,11 @@
 
 #include "mdns_types.h"
 
+#ifdef USE_BONJOUR_APPLE
 #include "mdns_win32.h"
+#elif defined USE_BONJOUR_HOWL
 #include "mdns_howl.h"
+#endif
 
 /**
  * Allocate space for the dns-sd data.
--- a/libpurple/win32/global.mak	Tue Jun 05 03:38:22 2007 +0000
+++ b/libpurple/win32/global.mak	Tue Jun 05 04:02:22 2007 +0000
@@ -14,7 +14,7 @@
 GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.6
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
 GTK_BIN ?= $(GTK_TOP)/bin
-HOWL_TOP ?= $(WIN32_DEV_TOP)/howl-1.0.0
+BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2
 NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4