# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1133318983 0
# Node ID deb955f7ebb7b12af8f1ff7debd55d8ee824250f
# Parent  df93ed932b3ad9dd5a6c031dc294ca0b67311bc4
[gaim-migrate @ 14570]
Re-enable sametime on win32 and make it build

committer: Tailor Script <tailor@pidgin.im>

diff -r df93ed932b3a -r deb955f7ebb7 Makefile.mingw
--- a/Makefile.mingw	Wed Nov 30 01:49:54 2005 +0000
+++ b/Makefile.mingw	Wed Nov 30 02:49:43 2005 +0000
@@ -72,7 +72,7 @@
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
 	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw
-#	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw
 
@@ -94,7 +94,7 @@
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install
-#	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
 	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
 
diff -r df93ed932b3a -r deb955f7ebb7 src/protocols/sametime/Makefile.mingw
--- a/src/protocols/sametime/Makefile.mingw	Wed Nov 30 01:49:54 2005 +0000
+++ b/src/protocols/sametime/Makefile.mingw	Wed Nov 30 02:49:43 2005 +0000
@@ -48,13 +48,10 @@
 
 INCLUDE_PATHS +=	-I$(SAMETIME_ROOT) \
 			-I$(SAMETIME_ROOT)/meanwhile \
+			-I$(SAMETIME_ROOT)/meanwhile/mpi \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GAIM_TOP)/src \
 			-I$(GAIM_TOP)/src/win32 \
 			-I$(GAIM_TOP)
@@ -67,23 +64,25 @@
 ##  SOURCES, OBJECTS
 ##
 
-C_SRC =		meanwhile/channel.c			\
-			meanwhile/cipher.c			\
-			meanwhile/common.c			\
-			meanwhile/error.c			\
-			meanwhile/message.c			\
-			meanwhile/mw_debug.c		\
-			meanwhile/mw_util.c			\
-			meanwhile/service.c			\
-			meanwhile/session.c			\
-			meanwhile/srvc_aware.c		\
-			meanwhile/srvc_conf.c		\
-			meanwhile/srvc_ft.c			\
-			meanwhile/srvc_im.c			\
-			meanwhile/srvc_resolve.c	\
-			meanwhile/srvc_store.c		\
-			meanwhile/st_list.c			\
-			sametime.c
+C_SRC =		meanwhile/mpi/mpi.c \
+		meanwhile/channel.c \
+		meanwhile/cipher.c \
+		meanwhile/common.c \
+		meanwhile/error.c \
+		meanwhile/message.c \
+		meanwhile/mw_debug.c \
+		meanwhile/mw_util.c \
+		meanwhile/service.c \
+		meanwhile/session.c \
+		meanwhile/srvc_aware.c \
+		meanwhile/srvc_conf.c \
+		meanwhile/srvc_ft.c \
+		meanwhile/srvc_im.c \
+		meanwhile/srvc_place.c \
+		meanwhile/srvc_resolve.c \
+		meanwhile/srvc_store.c \
+		meanwhile/st_list.c \
+		sametime.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
@@ -92,14 +91,12 @@
 ## LIBRARIES
 ##
 
-LIBS =		-lgtk-win32-2.0 \
-			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
-			-lintl \
-			-lws2_32 \
-			-lgaim
+LIBS =		\
+		-lglib-2.0 \
+		-lgobject-2.0 \
+		-lintl \
+		-lws2_32 \
+		-lgaim
 
 
 ##