Mercurial > pidgin
changeset 17767:34bf1a607d51
propagate from branch 'im.pidgin.pidgin' (head 371fb91ec4fdb33fa482efe55111fe58d8758c3b)
to branch 'im.pidgin.soc.2007.certmgr' (head 2d309d214816bda0f32a1c69d4cdf467607173f3)
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Fri, 25 May 2007 22:34:16 +0000 |
| parents | fe571cfcf225 (current diff) 8c056932bcc2 (diff) |
| children | 5ba545dfe2d6 |
| files | |
| diffstat | 5 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.mtn-ignore Fri May 25 22:26:27 2007 +0000 +++ b/.mtn-ignore Fri May 25 22:34:16 2007 +0000 @@ -5,6 +5,7 @@ .*/perl/common/blib.* .*/perl/common/pm_to_blib$ .*\.bs$ +.*\.def$ .*\.dll$ .*\.exe$ intltool-.* @@ -30,7 +31,7 @@ pidgin.spec$ pidgin-.*.tar.gz pidgin-.*.tar.bz2 -pidgin/pidgin +pidgin/pidgin$ pidgin/plugins/musicmessaging/music-messaging-bindings.c pidgin/plugins/perl/common/Makefile.PL$ pidgin/win32/pidgin_dll_rc.rc$ @@ -50,7 +51,7 @@ libpurple/purple-client-bindings.h libpurple/purple-client-example libpurple/tests/check_libpurple -libpurple/version.h +libpurple/version.h$ libpurple/win32/libpurplerc.rc$ libtool local.mak
--- a/config.h.mingw Fri May 25 22:26:27 2007 +0000 +++ b/config.h.mingw Fri May 25 22:34:16 2007 +0000 @@ -306,7 +306,7 @@ /* #undef HAVE_TZNAME */ /* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 +/*#define HAVE_UNISTD_H 1*/ /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1
--- a/libpurple/Makefile.mingw Fri May 25 22:26:27 2007 +0000 +++ b/libpurple/Makefile.mingw Fri May 25 22:34:16 2007 +0000 @@ -120,7 +120,7 @@ $(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(TARGET).dll $(TARGET).dll.a: $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll ## ## CLEAN RULES
--- a/libpurple/prpl.h Fri May 25 22:26:27 2007 +0000 +++ b/libpurple/prpl.h Fri May 25 22:34:16 2007 +0000 @@ -54,7 +54,9 @@ */ #define NO_BUDDY_ICONS {NULL, 0, 0, 0, 0, 0, 0} +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include "blist.h" #include "conversation.h"
--- a/pidgin/Makefile.mingw Fri May 25 22:26:27 2007 +0000 +++ b/pidgin/Makefile.mingw Fri May 25 22:34:16 2007 +0000 @@ -159,7 +159,7 @@ $(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H) $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS) - $(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(GTKPURPLES) $(DLL_LD_FLAGS) -Wl,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll + $(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(GTKPURPLES) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll $(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS) $(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe