changeset 11688:1fd2a974379f

[gaim-migrate @ 13974] This stuff theoretically should work on win32 now. I'm not particularly happy with my howl binary, so I'll keep it to myself for now. committer: Tailor Script <[e-mail]>

--- a/src/protocols/bonjour/Makefile.mingw	Mon Oct 17 21:12:56 2005 +0000
+++ b/src/protocols/bonjour/Makefile.mingw	Mon Oct 17 21:47:15 2005 +0000
@@ -13,6 +13,7 @@
 GAIM_TOP :=		../../..
 BONJOUR_ROOT :=		.
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
+HOWL_DIR := $(GAIM_TOP)/../win32-dev/howl-1.0.0
 
 ##
 ## VARIABLE DEFINITIONS
@@ -20,6 +21,8 @@
 
 TARGET = libbonjour
 
+NEEDED_DLLS =		$(HOWL_DIR)/bin/libhowl-1.dll
+
 # Compiler Options
 
 CFLAGS =
@@ -55,12 +58,14 @@
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
+			-I$(HOWL_DIR)/include/howl \
 			-I$(GAIM_TOP)/src \
 			-I$(GAIM_TOP)/src/win32 \
 			-I$(GAIM_TOP)
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
+			-L$(HOWL_DIR)/lib \
 			-L$(GAIM_TOP)/src
 
 
@@ -68,7 +73,10 @@
 ##  SOURCES, OBJECTS
 ##
 
-C_SRC =			rendezvous.c
+C_SRC =			bonjour.c \
+			buddy.c \
+			dns_sd.c \
+			jabber.c
 
 
 OBJECTS = $(C_SRC:%.c=%.o)
@@ -85,6 +93,7 @@
 			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
+			-lhowl \
 			-lgaim
 
 
@@ -107,6 +116,7 @@
 
 install:
 	cp $(BONJOUR_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 
 
 ##

--- a/src/protocols/bonjour/jabber.c	Mon Oct 17 21:12:56 2005 +0000
+++ b/src/protocols/bonjour/jabber.c	Mon Oct 17 21:47:15 2005 +0000
@@ -19,11 +19,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
+#ifndef _WIN32
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#else
+#include "libc_interface.h"
+#endif
+#include <sys/types.h>
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <unistd.h>