Mercurial > pidgin.yaz
changeset 27221:4892e488916a
merge of '225e515a43307f04c7c0570ba5877858a0f71209'
and '558f5ed16016e9ba8c7b5ccc6da9afb53de7ce3d'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 22 Jun 2009 02:53:47 +0000 |
| parents | 2967cea30d8b (current diff) f97cc05bf3b7 (diff) |
| children | e4421eaae7dd |
| files | |
| diffstat | 3 files changed, 82 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/Makefile.mingw Mon Jun 22 00:47:25 2009 +0000 +++ b/pidgin/plugins/Makefile.mingw Mon Jun 22 02:53:47 2009 +0000 @@ -7,6 +7,7 @@ PIDGIN_TREE_TOP := ../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak +DISCO_PLUGIN := ./disco GTKPERL_PLUGIN := ./perl TICKER_PLUGIN := ./ticker TRANSPARENCY_PLUGIN := ./win32/transparency @@ -58,12 +59,14 @@ .PHONY: all clean plugins install all: plugins + $(MAKE) -C $(DISCO_PLUGIN) -f $(MINGW_MAKEFILE) $(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) $(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) $(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install: all $(PIDGIN_INSTALL_PLUGINS_DIR) + $(MAKE) -C $(DISCO_PLUGIN) -f $(MINGW_MAKEFILE) install $(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) install $(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) install $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) install @@ -95,6 +98,7 @@ ## clean: rm -f *.o *.dll + $(MAKE) -C $(DISCO_PLUGIN) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) clean
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/plugins/disco/Makefile.mingw Mon Jun 22 02:53:47 2009 +0000 @@ -0,0 +1,77 @@ +# +# Makefile.mingw +# +# Description: Makefile for xmppdisco plugin. +# + +PIDGIN_TREE_TOP := ../../.. +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak + +TARGET = xmppdisco + +## +## INCLUDE PATHS +## +INCLUDE_PATHS += -I. \ + -I$(GTK_TOP)/include \ + -I$(GTK_TOP)/include/gtk-2.0 \ + -I$(GTK_TOP)/include/glib-2.0 \ + -I$(GTK_TOP)/include/pango-1.0 \ + -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ + -I$(GTK_TOP)/lib/glib-2.0/include \ + -I$(GTK_TOP)/lib/gtk-2.0/include \ + -I$(PURPLE_TOP) \ + -I$(PURPLE_TOP)/win32 \ + -I$(PIDGIN_TOP) \ + -I$(PIDGIN_TOP)/win32 \ + -I$(PIDGIN_TREE_TOP) + +LIB_PATHS += -L$(GTK_TOP)/lib \ + -L$(PURPLE_TOP) \ + -L$(PIDGIN_TOP) + +## +## SOURCES, OBJECTS +## +C_SRC = xmppdisco.c \ + gtkdisco.c + +OBJECTS = $(C_SRC:%.c=%.o) + +## +## LIBRARIES +## +LIBS = -lgtk-win32-2.0 \ + -lglib-2.0 \ + -lgdk-win32-2.0 \ + -lgobject-2.0 \ + -lintl \ + -lpurple \ + -lpidgin + +include $(PIDGIN_COMMON_RULES) + +## +## TARGET DEFINITIONS +## +.PHONY: all install clean + +all: $(TARGET).dll + +install: $(PIDGIN_INSTALL_PLUGINS_DIR) all + cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR) + +$(OBJECTS): $(PIDGIN_CONFIG_H) + +$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS) + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll + +## +## CLEAN RULES +## +clean: + rm -rf $(OBJECTS) + rm -rf $(TARGET).dll + +include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/win32/nsis/pidgin-installer.nsi Mon Jun 22 00:47:25 2009 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Mon Jun 22 02:53:47 2009 +0000 @@ -773,6 +773,7 @@ Delete "$INSTDIR\plugins\win2ktrans.dll" Delete "$INSTDIR\plugins\winprefs.dll" Delete "$INSTDIR\plugins\xmppconsole.dll" + Delete "$INSTDIR\plugins\xmppdisco.dll" RMDir "$INSTDIR\plugins" RMDir /r "$INSTDIR\sasl2" Delete "$INSTDIR\sounds\purple\alert.wav"