diff options
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fc-arch/makefile | 19 | ||||
| -rw-r--r-- | fontconfig/fc-case/makefile | 23 | ||||
| -rw-r--r-- | fontconfig/fc-glyphname/makefile | 22 | ||||
| -rw-r--r-- | fontconfig/fc-lang/makefile | 266 | ||||
| -rw-r--r-- | fontconfig/src/fcatomic.c | 1 | ||||
| -rw-r--r-- | fontconfig/src/fccache.c | 4 | ||||
| -rw-r--r-- | fontconfig/src/fcxml.c | 4 | ||||
| -rw-r--r-- | fontconfig/src/makealias.py | 36 | ||||
| -rw-r--r-- | fontconfig/src/makefile | 60 |
9 files changed, 428 insertions, 7 deletions
diff --git a/fontconfig/fc-arch/makefile b/fontconfig/fc-arch/makefile new file mode 100644 index 000000000..1ab4d0b36 --- /dev/null +++ b/fontconfig/fc-arch/makefile @@ -0,0 +1,19 @@ +INCLUDES+=..\src + +TMPL=fcarch.tmpl.h +STMPL=fcarch.tmpl.h +TARG=fcarch.h + +ARCHITECTURE=x86-vc + +TTYAPP=fc-arch +CSRCS=fc-arch.c + +DEFINES += HAVE_CONFIG_H +INCLUDES := .. $(INCLUDES) + +$(TARG): $(OBJDIR)\fc-arch.exe $(STMPL) ${top_srcdir}/src/fcint.h ..\config.h + del -e $(TARG) + $(OBJDIR)\fc-arch.exe $(ARCHITECTURE) < $(STMPL) > $(TARG).tmp + move $(TARG).tmp $(TARG) + diff --git a/fontconfig/fc-case/makefile b/fontconfig/fc-case/makefile new file mode 100644 index 000000000..4d93e9171 --- /dev/null +++ b/fontconfig/fc-case/makefile @@ -0,0 +1,23 @@ +INCLUDES+=..\src + +TMPL=fccase.tmpl.h +STMPL=${TMPL} +TARG=fccase.h + +TTYAPP=fc-case + +CSRCS= \ + fc-case.c + +CASEFOLDING=CaseFolding.txt +SCASEFOLDING=CaseFolding.txt + +DEFINES += HAVE_CONFIG_H +INCLUDES := .. $(INCLUDES) + +$(TARG): $(STMPL) $(OBJDIR)\fc-case.exe $(SCASEFOLDING) + del -e $(TARG) + $(OBJDIR)\fc-case.exe $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp + move $(TARG).tmp $(TARG) + + diff --git a/fontconfig/fc-glyphname/makefile b/fontconfig/fc-glyphname/makefile new file mode 100644 index 000000000..138c6e418 --- /dev/null +++ b/fontconfig/fc-glyphname/makefile @@ -0,0 +1,22 @@ +INCLUDES+=..\src + +TMPL=fcglyphname.tmpl.h +STMPL=${TMPL} +TARG=fcglyphname.h + +TTYAPP=fc-glyphname + +CSRCS= \ + fc-glyphname.c + +GLYPHNAME=zapfdingbats.txt +SGLYPHNAME=zapfdingbats.txt + +DEFINES += HAVE_CONFIG_H +INCLUDES := .. $(INCLUDES) + +$(TARG): $(STMPL) $(OBJDIR)\fc-glyphname.exe $(SGLYPHNAME) + del -e $(TARG) + $(OBJDIR)\fc-glyphname.exe $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp + move $(TARG).tmp $(TARG) + diff --git a/fontconfig/fc-lang/makefile b/fontconfig/fc-lang/makefile new file mode 100644 index 000000000..f28fcda0d --- /dev/null +++ b/fontconfig/fc-lang/makefile @@ -0,0 +1,266 @@ +INCLUDES+=..\src + +TMPL=fclang.tmpl.h +STMPL=fclang.tmpl.h +TARG=fclang.h + +TTYAPP=fc-lang + +CSRCS= \ + fc-lang.c + +# NOTE: +# +# The order of the orth files here is extremely important (part of the cache +# format) and should not be modified. New orth files should be added at the +# end. No files should be removed either. +# +ORTH = \ + aa.orth \ + ab.orth \ + af.orth \ + am.orth \ + ar.orth \ + as.orth \ + ast.orth \ + av.orth \ + ay.orth \ + az_az.orth \ + az_ir.orth \ + ba.orth \ + bm.orth \ + be.orth \ + bg.orth \ + bh.orth \ + bho.orth \ + bi.orth \ + bin.orth \ + bn.orth \ + bo.orth \ + br.orth \ + bs.orth \ + bua.orth \ + ca.orth \ + ce.orth \ + ch.orth \ + chm.orth \ + chr.orth \ + co.orth \ + cs.orth \ + cu.orth \ + cv.orth \ + cy.orth \ + da.orth \ + de.orth \ + dz.orth \ + el.orth \ + en.orth \ + eo.orth \ + es.orth \ + et.orth \ + eu.orth \ + fa.orth \ + fi.orth \ + fj.orth \ + fo.orth \ + fr.orth \ + ff.orth \ + fur.orth \ + fy.orth \ + ga.orth \ + gd.orth \ + gez.orth \ + gl.orth \ + gn.orth \ + gu.orth \ + gv.orth \ + ha.orth \ + haw.orth \ + he.orth \ + hi.orth \ + ho.orth \ + hr.orth \ + hu.orth \ + hy.orth \ + ia.orth \ + ig.orth \ + id.orth \ + ie.orth \ + ik.orth \ + io.orth \ + is.orth \ + it.orth \ + iu.orth \ + ja.orth \ + ka.orth \ + kaa.orth \ + ki.orth \ + kk.orth \ + kl.orth \ + km.orth \ + kn.orth \ + ko.orth \ + kok.orth \ + ks.orth \ + ku_am.orth \ + ku_ir.orth \ + kum.orth \ + kv.orth \ + kw.orth \ + ky.orth \ + la.orth \ + lb.orth \ + lez.orth \ + ln.orth \ + lo.orth \ + lt.orth \ + lv.orth \ + mg.orth \ + mh.orth \ + mi.orth \ + mk.orth \ + ml.orth \ + mn_cn.orth \ + mo.orth \ + mr.orth \ + mt.orth \ + my.orth \ + nb.orth \ + nds.orth \ + ne.orth \ + nl.orth \ + nn.orth \ + no.orth \ + nr.orth \ + nso.orth \ + ny.orth \ + oc.orth \ + om.orth \ + or.orth \ + os.orth \ + pa.orth \ + pl.orth \ + ps_af.orth \ + ps_pk.orth \ + pt.orth \ + rm.orth \ + ro.orth \ + ru.orth \ + sa.orth \ + sah.orth \ + sco.orth \ + se.orth \ + sel.orth \ + sh.orth \ + shs.orth \ + si.orth \ + sk.orth \ + sl.orth \ + sm.orth \ + sma.orth \ + smj.orth \ + smn.orth \ + sms.orth \ + so.orth \ + sq.orth \ + sr.orth \ + ss.orth \ + st.orth \ + sv.orth \ + sw.orth \ + syr.orth \ + ta.orth \ + te.orth \ + tg.orth \ + th.orth \ + ti_er.orth \ + ti_et.orth \ + tig.orth \ + tk.orth \ + tl.orth \ + tn.orth \ + to.orth \ + tr.orth \ + ts.orth \ + tt.orth \ + tw.orth \ + tyv.orth \ + ug.orth \ + uk.orth \ + ur.orth \ + uz.orth \ + ve.orth \ + vi.orth \ + vo.orth \ + vot.orth \ + wa.orth \ + wen.orth \ + wo.orth \ + xh.orth \ + yap.orth \ + yi.orth \ + yo.orth \ + zh_cn.orth \ + zh_hk.orth \ + zh_mo.orth \ + zh_sg.orth \ + zh_tw.orth \ + zu.orth \ + ak.orth \ + an.orth \ + ber_dz.orth \ + ber_ma.orth \ + byn.orth \ + crh.orth \ + csb.orth \ + dv.orth \ + ee.orth \ + fat.orth \ + fil.orth \ + hne.orth \ + hsb.orth \ + ht.orth \ + hz.orth \ + ii.orth \ + jv.orth \ + kab.orth \ + kj.orth \ + kr.orth \ + ku_iq.orth \ + ku_tr.orth \ + kwm.orth \ + lg.orth \ + li.orth \ + mai.orth \ + mn_mn.orth \ + ms.orth \ + na.orth \ + ng.orth \ + nv.orth \ + ota.orth \ + pa_pk.orth \ + pap_an.orth \ + pap_aw.orth \ + qu.orth \ + rn.orth \ + rw.orth \ + sc.orth \ + sd.orth \ + sg.orth \ + sid.orth \ + sn.orth \ + su.orth \ + ty.orth \ + wal.orth \ + za.orth \ + lah.orth +# ^-------------- Add new orth files here + +DEFINES += HAVE_CONFIG_H +INCLUDES := .. $(INCLUDES) + +$(TARG):$(ORTH) $(OBJDIR)\fc-lang.exe $(STMPL) + del -e $(TARG) + $(OBJDIR)\fc-lang.exe -d . $(ORTH) < $(STMPL) > $(TARG).tmp + move $(TARG).tmp $(TARG) + diff --git a/fontconfig/src/fcatomic.c b/fontconfig/src/fcatomic.c index 89cae6183..d6121305a 100644 --- a/fontconfig/src/fcatomic.c +++ b/fontconfig/src/fcatomic.c @@ -56,6 +56,7 @@ #include <time.h> #ifdef _WIN32 +#undef mkdir #define mkdir(path,mode) _mkdir(path) #endif diff --git a/fontconfig/src/fccache.c b/fontconfig/src/fccache.c index 69e1a6b82..d62b19346 100644 --- a/fontconfig/src/fccache.c +++ b/fontconfig/src/fccache.c @@ -32,9 +32,6 @@ #if defined(HAVE_MMAP) || defined(__CYGWIN__) # include <unistd.h> # include <sys/mman.h> -#elif defined(_WIN32) -# define _WIN32_WINNT 0x0500 -# include <windows.h> #endif #ifndef O_BINARY @@ -809,6 +806,7 @@ bail1: #ifdef _WIN32 +#undef mkdir #define mkdir(path,mode) _mkdir(path) #endif diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index 9428468a4..74b6c8143 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -53,10 +53,6 @@ #endif /* ENABLE_LIBXML2 */ #ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#define STRICT -#include <windows.h> -#undef STRICT #include <mbstring.h> #endif diff --git a/fontconfig/src/makealias.py b/fontconfig/src/makealias.py new file mode 100644 index 000000000..6afca0901 --- /dev/null +++ b/fontconfig/src/makealias.py @@ -0,0 +1,36 @@ +import sys,os,re,glob + +SRCDIR=sys.argv[1] +HEAD=open(sys.argv[2],"w") +TAIL=open(sys.argv[3],"w") + +#rm -f $HEAD $TAIL +TAIL.write("#if HAVE_GNUC_ATTRIBUTE\n") + +InputFiles=sys.argv[4:] +Names=[] +for Input in InputFiles: + buffer=open(Input,"r").read() + Names.extend(re.findall(r'\n(Fc[^ ]*) *\(',buffer)) + +def SearchCFiles(Name): + Files=glob.glob(os.path.join(SRCDIR,"*.c") ) + for File in Files: + buffer=open(File,"r").read() + res = re.findall(r'\n%s[ \(].*'%Name,buffer) + if res: + File=re.sub(r'^.*[\\/]','',File) + return "__"+re.sub(r'\.c','__',File) + +for Name in Names: + if Name=="FcCacheDir" or Name=="FcCacheSubdir": + continue + + alias="IA__"+Name + HEAD.write("extern __typeof (%s) %s;\n"%(Name,alias)) + HEAD.write("#define %s %s\n"%(Name,alias)) + TAIL.write("#ifdef "+SearchCFiles(Name)+"\n") + TAIL.write("#undef %s\n"%Name) + TAIL.write("extern __typeof (%s) %s;\n"%(Name,Name)) + TAIL.write("#endif\n") +TAIL.write("#endif\n") diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile new file mode 100644 index 000000000..4a9ac4dc1 --- /dev/null +++ b/fontconfig/src/makefile @@ -0,0 +1,60 @@ + +#INCLUDES = \ +# -I$(top_srcdir) \ +# -I$(top_srcdir)/src \ +# $(FREETYPE_CFLAGS) \ +# $(LIBXML2_CFLAGS) \ +# $(EXPAT_CFLAGS) \ +# $(WARN_CFLAGS) \ +# -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ +# -DFONTCONFIG_PATH='"$(CONFDIR)"' + +load_makefile DEBUG=0 ..\fc-arch\makefile +load_makefile DEBUG=0 ..\fc-case\makefile +load_makefile DEBUG=0 ..\fc-glyphname\makefile +load_makefile DEBUG=0 ..\fc-lang\makefile + +CSRCS = \ + fcatomic.c \ + fcblanks.c \ + fccache.c \ + fccfg.c \ + fccharset.c \ + fcdbg.c \ + fcdefault.c \ + fcdir.c \ + fcformat.c \ + fcfreetype.c \ + fcfs.c \ + fcinit.c \ + fclang.c \ + fclist.c \ + fcmatch.c \ + fcmatrix.c \ + fcname.c \ + fcpat.c \ + fcserialize.c \ + fcstr.c \ + fcxml.c \ + \ + ftglue.c + +LIBRARY = libfontconfig + +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 + +fcalias.h fcaliastail.h: makealias.py $(PUBLIC_FILES) + python makealias.py . fcalias.h fcaliastail.h $(PUBLIC_FILES) + +fcftalias.h fcftaliastail.h: makealias.py $(PUBLIC_FT_FILES) + python makealias.py . fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES) + |