# HG changeset patch # User Daniel Atallah # Date 1172459975 0 # Node ID 8e08e961813c39f9eee7f3648b6bc0ce6393ad8b # Parent 1e4f4e000c7634ceb29671462d1ef23b6ea078ce I forgot to add the new mingw makefiles. diff -r 1e4f4e000c76 -r 8e08e961813c libpurple/win32/win32dep.c --- a/libpurple/win32/win32dep.c Mon Feb 26 01:11:44 2007 +0000 +++ b/libpurple/win32/win32dep.c Mon Feb 26 03:19:35 2007 +0000 @@ -588,6 +588,8 @@ } /* DLL initializer */ +/* suppress gcc "no previous prototype" warning */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { libgaimdll_hInstance = hinstDLL; return TRUE; diff -r 1e4f4e000c76 -r 8e08e961813c pidgin/pixmaps/tray/22/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/22/Makefile.mingw Mon Feb 26 03:19:35 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidgintraypix_DATA)'; then \ + mkdir -p $(pidgintraypixdir); \ + cp $(pidgintraypix_DATA) $(pidgintraypixdir); \ + fi; + diff -r 1e4f4e000c76 -r 8e08e961813c pidgin/pixmaps/tray/Makefile.am --- a/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 01:11:44 2007 +0000 +++ b/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 03:19:35 2007 +0000 @@ -1,1 +1,6 @@ SUBDIRS = 22 + +EXTRA_DIST = \ + Makefile.mingw \ + 22/Makefile.mingw + diff -r 1e4f4e000c76 -r 8e08e961813c pidgin/pixmaps/tray/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/Makefile.mingw Mon Feb 26 03:19:35 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi;