# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1121068372 0
# Node ID af2a4d5b9afe85819a94082a6a45f091d27fa2c0
# Parent  355595881218eb3099cd7ae89f674c4ca08399ed
[gaim-migrate @ 13111]
Make sametime build by default on windows thanks to Kevin Stange

committer: Tailor Script <tailor@pidgin.im>

diff -r 355595881218 -r af2a4d5b9afe Makefile.mingw
--- a/Makefile.mingw	Mon Jul 11 06:04:28 2005 +0000
+++ b/Makefile.mingw	Mon Jul 11 07:52:52 2005 +0000
@@ -25,6 +25,7 @@
 GG = $(GAIM_PROTOS)/gg
 NOVELL = $(GAIM_PROTOS)/novell
 SILC = $(GAIM_PROTOS)/silc
+SAMETIME = $(GAIM_PROTOS)/sametime
 PO = ./po
 
 MAKENSIS := makensis.exe
@@ -57,6 +58,7 @@
 NOVELL_TYPE = PLUGIN
 TREPIA_TYPE = PLUGIN
 SILC_TYPE = PLUGIN
+SAMETIME_TYPE = PLUGIN
 
 all:
 	cp config.h.mingw config.h
@@ -69,6 +71,7 @@
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -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
 
@@ -89,6 +92,7 @@
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -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
 
@@ -115,6 +119,7 @@
 	$(MAKE) -C $(GG) -f Makefile.mingw clean
 	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
 	$(MAKE) -C $(SILC) -f Makefile.mingw clean
+	$(MAKE) -C $(SAMETIME) -f Makefile.mingw clean
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean
 	rm -rf config.h $(GAIM_INSTALL_DIR)
diff -r 355595881218 -r af2a4d5b9afe gaim-installer.nsi
--- a/gaim-installer.nsi	Mon Jul 11 06:04:28 2005 +0000
+++ b/gaim-installer.nsi	Mon Jul 11 07:52:52 2005 +0000
@@ -612,6 +612,7 @@
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
     Delete "$INSTDIR\plugins\libsilc.dll"
+    Delete "$INSTDIR\plugins\libsametime.dll"
     Delete "$INSTDIR\plugins\perl.dll"
     Delete "$INSTDIR\plugins\relnot.dll"
     Delete "$INSTDIR\plugins\spellchk.dll"
diff -r 355595881218 -r af2a4d5b9afe src/Makefile.mingw
--- a/src/Makefile.mingw	Mon Jul 11 06:04:28 2005 +0000
+++ b/src/Makefile.mingw	Mon Jul 11 07:52:52 2005 +0000
@@ -125,6 +125,7 @@
 			idle.c \
 			imgstore.c \
 			log.c \
+			mime.c \
 			network.c \
 			notify.c \
 			plugin.c \
diff -r 355595881218 -r af2a4d5b9afe src/protocols/sametime/.cvsignore
--- a/src/protocols/sametime/.cvsignore	Mon Jul 11 06:04:28 2005 +0000
+++ b/src/protocols/sametime/.cvsignore	Mon Jul 11 07:52:52 2005 +0000
@@ -4,5 +4,7 @@
 *.la
 *.lo
 *.o
+*.dll
+*.lib
 Makefile
 Makefile.in
diff -r 355595881218 -r af2a4d5b9afe src/protocols/sametime/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/protocols/sametime/Makefile.mingw	Mon Jul 11 07:52:52 2005 +0000
@@ -0,0 +1,147 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of libsametime
+#
+
+#
+# PATHS
+#
+
+SAMETIME_ROOT :=		.
+GTK_TOP :=		../../../../win32-dev/gtk_2_0
+GAIM_TOP :=		../../..
+GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
+
+##
+## VARIABLE DEFINITIONS
+##
+
+TARGET = libsametime
+
+# Compiler Options
+
+CFLAGS =
+
+DEFINES =
+
+# Static or Plugin...
+ifeq ($(TYPE),STATIC)
+  DEFINES += -DSTATIC
+  DLL_INSTALL_DIR = 	$(GAIM_INSTALL_DIR)
+else 
+  ifeq ($(TYPE),PLUGIN)
+    DLL_INSTALL_DIR = 	$(GAIM_INSTALL_DIR)/plugins
+  endif
+endif
+
+
+##
+## INCLUDE  MAKEFILES
+##
+
+include $(GAIM_TOP)/src/win32/global.mak
+
+##
+## INCLUDE PATHS
+##
+
+INCLUDE_PATHS +=	-I$(SAMETIME_ROOT) \
+			-I$(SAMETIME_ROOT)/meanwhile \
+			-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)
+
+LIB_PATHS =		-L$(GTK_TOP)/lib \
+			-L$(GAIM_TOP)/src
+
+
+##
+##  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
+
+OBJECTS = $(C_SRC:%.c=%.o)
+
+
+##
+## LIBRARIES
+##
+
+LIBS =		-lgtk-win32-2.0 \
+			-lglib-2.0 \
+			-lgdk-win32-2.0 \
+			-lgmodule-2.0 \
+			-lgobject-2.0 \
+			-lintl \
+			-lws2_32 \
+			-lgaim
+
+
+##
+## RULES
+##
+
+# How to make a C file
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
+
+##
+## TARGET DEFINITIONS
+##
+
+.PHONY: all clean
+
+all: $(TARGET).dll
+
+install:
+	cp $(OSCAR_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR)
+
+
+##
+## BUILD Dependencies
+##
+
+$(GAIM_TOP)/src/gaim.lib:
+	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
+
+##
+## BUILD DLL
+##
+
+$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll
+
+##
+## CLEAN RULES
+##
+
+clean:
+	rm -rf *.o
+	rm -rf $(TARGET).dll
+	rm -rf $(TARGET).lib