Mercurial > pidgin
changeset 9570:24f84b7ffe8e
[gaim-migrate @ 10413]
* Napster joins WinGaim binary release
* Silc makefile cleanup
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Wed, 21 Jul 2004 16:04:07 +0000 |
| parents | 8ba8477ca7b6 |
| children | b3711e089751 |
| files | ChangeLog.win32 Makefile.mingw gaim-installer.nsi src/protocols/napster/Makefile.am src/protocols/silc/Makefile.mingw src/win32/libc_interface.h |
| diffstat | 6 files changed, 25 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.win32 Tue Jul 20 03:46:17 2004 +0000 +++ b/ChangeLog.win32 Wed Jul 21 16:04:07 2004 +0000 @@ -1,3 +1,6 @@ +version 0.81cvs: + * Napster joins binary release (Thanks Kevin) + version 0.80 (07/15/2004): * idletrack.dll now unloads properly when you quit Gaim in Windows 2000 or later, so the installer will no longer report an error
--- a/Makefile.mingw Tue Jul 20 03:46:17 2004 +0000 +++ b/Makefile.mingw Wed Jul 21 16:04:07 2004 +0000 @@ -61,6 +61,7 @@ $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw + $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw @@ -79,6 +80,7 @@ $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw install $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install + $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw install $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) @@ -103,6 +105,7 @@ $(MAKE) -C $(MSN) -f Makefile.mingw clean $(MAKE) -C $(IRC) -f Makefile.mingw clean $(MAKE) -C $(JABBER) -f Makefile.mingw clean + $(MAKE) -C $(NAPSTER) -f Makefile.mingw clean $(MAKE) -C $(GG) -f Makefile.mingw clean $(MAKE) -C $(NOVELL) -f Makefile.mingw clean $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean
--- a/gaim-installer.nsi Tue Jul 20 03:46:17 2004 +0000 +++ b/gaim-installer.nsi Wed Jul 21 16:04:07 2004 +0000 @@ -558,6 +558,7 @@ Delete "$INSTDIR\plugins\libirc.dll" Delete "$INSTDIR\plugins\libjabber.dll" Delete "$INSTDIR\plugins\libmsn.dll" + Delete "$INSTDIR\plugins\libnapster.dll" Delete "$INSTDIR\plugins\libnovell.dll" Delete "$INSTDIR\plugins\liboscar.dll" Delete "$INSTDIR\plugins\libtoc.dll"
--- a/src/protocols/napster/Makefile.am Tue Jul 20 03:46:17 2004 +0000 +++ b/src/protocols/napster/Makefile.am Wed Jul 21 16:04:07 2004 +0000 @@ -1,3 +1,6 @@ +EXTRA_DIST = \ + Makefile.mingw + pkgdir = $(libdir)/gaim NAPSTERSOURCES = napster.c
--- a/src/protocols/silc/Makefile.mingw Tue Jul 20 03:46:17 2004 +0000 +++ b/src/protocols/silc/Makefile.mingw Wed Jul 21 16:04:07 2004 +0000 @@ -13,7 +13,7 @@ GAIM_TOP := ../../.. SILC_ROOT := . GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -SILC_TOP := ../../../../win32-dev/silc-toolkit +SILC_TOP := ../../../../win32-dev/silc-toolkit-0.9.12 ## ## VARIABLE DEFINITIONS @@ -21,8 +21,8 @@ TARGET = libsilcgaim -NEEDED_DLLS = $(SILC_TOP)/lib/silc.dll \ - $(SILC_TOP)/lib/silcclient.dll +NEEDED_DLLS = $(SILC_TOP)/win32/libsilc/Release/libsilc.dll \ + $(SILC_TOP)/win32/libsilcclient/Release/libsilcclient.dll # Compiler Options @@ -62,19 +62,21 @@ -I$(GAIM_TOP)/src \ -I$(GAIM_TOP)/src/win32 \ -I$(GAIM_TOP) \ - -I$(SILC_TOP)/include + -I$(SILC_TOP)/win32 \ + -I$(SILC_TOP)/win32/include -LIB_PATHS = -L$(GTK_TOP)/lib \ +LIB_PATHS = -L$(GTK_TOP)/lib \ -L$(GAIM_TOP)/src \ - -L$(SILC_TOP)/lib + -L$(SILC_TOP)/win32/libsilc/Release \ + -L$(SILC_TOP)/win32/libsilcclient/Release \ ## ## SOURCES, OBJECTS ## -C_SRC = silc.c \ +C_SRC = silc.c \ buddy.c \ chat.c \ ft.c \ @@ -90,7 +92,7 @@ ## LIBRARIES ## -LIBS = -lgtk-win32-2.0 \ +LIBS = -lgtk-win32-2.0 \ -lglib-2.0 \ -lgdk-win32-2.0 \ -lgmodule-2.0 \ @@ -98,8 +100,8 @@ -lws2_32 \ -lintl \ -lgaim \ - -lsilc \ - -lsilcclient \ + -llibsilc \ + -llibsilcclient \ -lwsock32 @@ -137,7 +139,7 @@ ## $(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 + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x64000000 -o $(TARGET).dll ## ## CLEAN RULES
--- a/src/win32/libc_interface.h Tue Jul 20 03:46:17 2004 +0000 +++ b/src/win32/libc_interface.h Wed Jul 21 16:04:07 2004 +0000 @@ -109,7 +109,9 @@ #define close( fd ) \ wgaim_close( fd ) +#ifndef sleep #define sleep(x) Sleep((x)*1000) +#endif extern int wgaim_gethostname(char *name, size_t size); #define gethostname( name, size ) \