changeset 12643:29c034547358

[gaim-migrate @ 14980] This allows sametime to compile if you have the libmeanwhile devel package. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 23 Dec 2005 18:33:52 +0000
parents 022bf81f4087
children db5241525e53
files src/protocols/sametime/Makefile.mingw
diffstat 1 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/sametime/Makefile.mingw	Fri Dec 23 12:47:02 2005 +0000
+++ b/src/protocols/sametime/Makefile.mingw	Fri Dec 23 18:33:52 2005 +0000
@@ -8,8 +8,9 @@
 # PATHS
 #
 
-SAMETIME_ROOT :=		.
+SAMETIME_ROOT :=	.
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
+MEANWHILE_TOP:=		../../../../win32-dev/libmeanwhile-1.0.0
 GAIM_TOP :=		../../..
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 
@@ -19,6 +20,8 @@
 
 TARGET = libsametime
 
+NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
+
 # Compiler Options
 
 CFLAGS =
@@ -29,7 +32,7 @@
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
   DLL_INSTALL_DIR = 	$(GAIM_INSTALL_DIR)
-else 
+else
   ifeq ($(TYPE),PLUGIN)
     DLL_INSTALL_DIR = 	$(GAIM_INSTALL_DIR)/plugins
   endif
@@ -47,15 +50,16 @@
 ##
 
 INCLUDE_PATHS +=	-I$(SAMETIME_ROOT) \
+			-I$(MEANWHILE_TOP)/include/meanwhile \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GAIM_TOP)/src \
 			-I$(GAIM_TOP)/src/win32 \
-			-I$(GAIM_TOP) \
-			$(MEANWHILE_CFLAGS)
+			-I$(GAIM_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
+			-L$(MEANWHILE_TOP)/lib \
 			-L$(GAIM_TOP)/src
 
 
@@ -74,11 +78,10 @@
 
 LIBS =		\
 		-lglib-2.0 \
-		-lgobject-2.0 \
 		-lintl \
 		-lws2_32 \
+		-lmeanwhile \
 		-lgaim \
-		$(MEANWHILE_LIBS)
 
 ##
 ## RULES
@@ -99,6 +102,7 @@
 
 install:
 	cp $(SAMETIME_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 
 
 ##