Mercurial > pidgin
changeset 15403:deeaffeda047
merge of '7daaf59bc033f5665ab67b267aa5b270469e3ead'
and 'eac90dc3715014deec3d806ac48c6c6be16a4c4d'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 24 Jan 2007 21:03:20 +0000 |
| parents | 3a943f4af57e (current diff) 1ec72a759b5c (diff) |
| children | 14f1a1fad65e 15b00aff6631 |
| files | |
| diffstat | 8 files changed, 78 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/win32/win32dep.h Wed Jan 24 21:02:37 2007 +0000 +++ b/libpurple/win32/win32dep.h Wed Jan 24 21:03:20 2007 +0000 @@ -28,6 +28,11 @@ #include "wgaimerror.h" #include "libc_interface.h" +/* rpcndr.h defines small as char, causing problems, so we need to undefine it */ +#ifdef _WIN32 +#undef small +#endif + /* * PROTOS */
--- a/pidgin/pixmaps/emotes/Makefile.am Wed Jan 24 21:02:37 2007 +0000 +++ b/pidgin/pixmaps/emotes/Makefile.am Wed Jan 24 21:03:20 2007 +0000 @@ -1,1 +1,3 @@ SUBDIRS=default none + +EXTRA_DIST = Makefile.mingw
--- a/pidgin/pixmaps/emotes/default/Makefile.am Wed Jan 24 21:02:37 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/Makefile.am Wed Jan 24 21:03:20 2007 +0000 @@ -1,1 +1,5 @@ SUBDIRS=22 scalable + +EXTRA_DIST= \ + 22/Makefile.mingw \ + scalable/Makefile.mingw
--- a/pidgin/pixmaps/emotes/none/Makefile.am Wed Jan 24 21:02:37 2007 +0000 +++ b/pidgin/pixmaps/emotes/none/Makefile.am Wed Jan 24 21:03:20 2007 +0000 @@ -1,4 +1,5 @@ gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/none gaimsmileypix_DATA = theme -EXTRA_DIST = $(gaimsmileypix_DATA) +EXTRA_DIST = $(gaimsmileypix_DATA) \ + Makefile.mingw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/16/Makefile.mingw Wed Jan 24 21:03:20 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 '$(pidginstatuspix_DATA)'; then \ + mkdir -p $(pidginstatuspixdir); \ + cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/Makefile.mingw Wed Jan 24 21:03:20 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 '$(pidginstatuspix_DATA)'; then \ + mkdir -p $(pidginstatuspixdir); \ + cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/32/Makefile.mingw Wed Jan 24 21:03:20 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 '$(pidginstatuspix_DATA)'; then \ + mkdir -p $(pidginstatuspixdir); \ + cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \ + fi; +