/pidgin/main: 392528e9a372: Fix compilation for win32

Tomasz Wasilczyk tomkiewicz at cpw.pidgin.im
Thu May 9 16:55:05 EDT 2013


Changeset: 392528e9a372399f6a842c5649ee54ecc73cbd54
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-05-09 22:54 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/392528e9a372

Description:

Fix compilation for win32

diffstat:

 libpurple/win32/rules.mak |  6 ++++++
 pidgin/Makefile.mingw     |  2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (25 lines):

diff --git a/libpurple/win32/rules.mak b/libpurple/win32/rules.mak
--- a/libpurple/win32/rules.mak
+++ b/libpurple/win32/rules.mak
@@ -11,3 +11,9 @@
 
 %.desktop: %.desktop.in $(wildcard $(PIDGIN_TREE_TOP)/po/*.po)
 	LC_ALL=C $(PERL) $(INTLTOOL_MERGE) -d -u -c $(PIDGIN_TREE_TOP)/po/.intltool-merge-cache $(PIDGIN_TREE_TOP)/po $< $@
+
+%.html.h: %.html
+	@echo -e "  GEN\t$@"
+	@echo "static const char $*_html[] = {" > $@
+	@sed -e 's/^[ 	]\+//g' -e 's/[ 	]\+/ /g' $< | xxd -i | sed -e 's/\(0x[0-9a-f][0-9a-f]\)$$/\1, 0x00/' >> $@
+	@echo "};" >> $@
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -166,6 +166,8 @@ win32/pidgin_dll_rc.rc: win32/pidgin_dll
 
 $(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
 
+gtkdebug.c: gtkdebug.html.h
+
 $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_OBJECTS)
 	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 



More information about the Commits mailing list