changeset
merge of '30e5a886616145bb8c25ad7b1fe9cffc32c7177b'
Wed, 24 Jan 2007 21:03:20 +0000
- author
- Sean Egan <seanegan@pidgin.im>
- date
- Wed, 24 Jan 2007 21:03:20 +0000
- changeset 15465
- ff8fc188b319
- parent 15464
- 30e5a8866161 (current diff)
- parent 15459
- 2b5e94b4b17a (diff)
- child 15466
- 85a4ba4f43c5
- child 15467
- 80249aabf181
merge of '30e5a886616145bb8c25ad7b1fe9cffc32c7177b'
and '2b5e94b4b17a097893ee80e647c42e92c9447c9b'
--- 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; +
