diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 16:11:46 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 16:11:46 +0100 |
| commit | b73b2300e7f9b90369efd2f14f086f68ee15d55f (patch) | |
| tree | 0e349d5a3c1debefe3ba69f0c3e0be1e3a392b9b /fontconfig | |
| parent | 0e950715b62dcf30ffbf69831bf932fd348537e5 (diff) | |
| download | vcxsrv-b73b2300e7f9b90369efd2f14f086f68ee15d55f.tar.gz vcxsrv-b73b2300e7f9b90369efd2f14f086f68ee15d55f.tar.bz2 vcxsrv-b73b2300e7f9b90369efd2f14f086f68ee15d55f.zip | |
Solved compile problems in fontconfig introduced by latest merge
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/config.h | 4 | ||||
| -rw-r--r-- | fontconfig/src/cleangperf.py | 8 | ||||
| -rw-r--r-- | fontconfig/src/makefile | 16 |
3 files changed, 24 insertions, 4 deletions
diff --git a/fontconfig/config.h b/fontconfig/config.h index e9ebf015e..eea2ea488 100644 --- a/fontconfig/config.h +++ b/fontconfig/config.h @@ -4,4 +4,6 @@ #define HAVE_RAND 1 #define HAVE_STRUCT_DIRENT_D_TYPE 1 #undef __STDC__ -#define FLEXIBLE_ARRAY_MEMBER
\ No newline at end of file +#define FLEXIBLE_ARRAY_MEMBER +#define inline __inline + 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) |