From b73b2300e7f9b90369efd2f14f086f68ee15d55f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 7 Jan 2013 16:11:46 +0100
Subject: Solved compile problems in fontconfig introduced by latest merge

---
 fontconfig/src/cleangperf.py |  8 ++++++++
 fontconfig/src/makefile      | 16 +++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 fontconfig/src/cleangperf.py

(limited to 'fontconfig/src')

diff --git a/fontconfig/src/cleangperf.py b/fontconfig/src/cleangperf.py
new file mode 100644
index 000000000..a276312c9
--- /dev/null
+++ b/fontconfig/src/cleangperf.py
@@ -0,0 +1,8 @@
+import sys,re
+
+inbuffer=sys.stdin.read()
+inbuffer=re.sub(r'[ \t\r\n]*\n[ \t]*',r'\n',inbuffer)
+inbuffer=re.sub(r'[ \t\r\n]*,[ \t\r\n]',r',',inbuffer)
+inbuffer=re.sub(r'\n#[^\n]+','',inbuffer)
+sys.stdout.write(inbuffer)
+
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile
index 091584172..024ca979d 100644
--- a/fontconfig/src/makefile
+++ b/fontconfig/src/makefile
@@ -1,3 +1,14 @@
+$(OBJDIR)\fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
+	cp $< $<.c
+	$(CPP) -EP -I.. $<.c | \
+	python cleangperf.py | \
+	gawk '/CUT_OUT_BEGIN/ { no_write=1; next; }; /CUT_OUT_END/ { no_write=0; next; }; { if (!no_write) print; next; };' - > $@.tmp
+	mv -f $@.tmp $@
+	rm $<.c
+
+$(OBJDIR)\fcobjshash.h: $(OBJDIR)\fcobjshash.gperf
+	gperf -m 100 $< > $@
+
 
 load_makefile NORELDBG=1 ..\fc-case\makefile
 load_makefile NORELDBG=1 ..\fc-glyphname\makefile
@@ -27,7 +38,6 @@ CSRCS = \
 	fcstat.c \
 	fcstr.c \
 	fcxml.c \
-	\
 	ftglue.c
 
 LIBRARY = libfontconfig
@@ -36,12 +46,12 @@ PUBLIC_FILES = \
 	..\fontconfig\fontconfig.h \
 	fcdeprecate.h \
 	..\fontconfig\fcprivate.h
-	
+
 PUBLIC_FT_FILES = \
 	..\fontconfig\fcfreetype.h
 
 DEFINES += FC_CACHEDIR="""getenv(\"""TEMP\""")""" FC_DEFAULT_FONTS="""WINDOWSFONTDIR"""
-INCLUDES := .. $(INCLUDES) $(MHMAKECONF)\freetype\include $(MHMAKECONF)\libxml2\include $(MHMAKECONF)\iconv\include
+INCLUDES := .. $(OBJDIR) $(INCLUDES) $(MHMAKECONF)\freetype\include $(MHMAKECONF)\libxml2\include $(MHMAKECONF)\iconv\include
 
 fcalias.h fcaliastail.h: makealias.py $(PUBLIC_FILES)
 	python makealias.py . fcalias.h fcaliastail.h $(PUBLIC_FILES)
-- 
cgit v1.2.3