X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a7faf1e02ef2b640dc08516f1c2f56edb1004ea..4e28924cdb58dfbba0ec6cd5d52ef1346d0cb569:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5d3720b476..f7b9d611b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,10 +43,29 @@ VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
 
+FTVP01 = @top_srcdir@/src/freetype/unix
+FTVP02 = @top_srcdir@/src/freetype/autohint
+FTVP03 = @top_srcdir@/src/freetype/base
+FTVP04 = @top_srcdir@/src/freetype/cff
+FTVP05 = @top_srcdir@/src/freetype/cid
+FTVP06 = @top_srcdir@/src/freetype/macfond
+FTVP07 = @top_srcdir@/src/freetype/otlayout
+FTVP08 = @top_srcdir@/src/freetype/psnames
+FTVP09 = @top_srcdir@/src/freetype/raster1
+FTVP10 = @top_srcdir@/src/freetype/sfnt
+FTVP11 = @top_srcdir@/src/freetype/smooth
+FTVP12 = @top_srcdir@/src/freetype/truetype
+FTVP13 = @top_srcdir@/src/freetype/type1
+FTVP14 = @top_srcdir@/src/freetype/type1z
+FTVP15 = @top_srcdir@/src/freetype/winfonts
+
+VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
+
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -119,6 +138,7 @@ MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 ODBCDIR  = $(WXDIR)/src/iodbc
+FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
@@ -195,6 +215,24 @@ PNGOBJS     = \
 		pngget.o \
 		pngset.o
 
+FREETYPEOBJS = \
+		ftsystem.o \
+		autohint.o \
+		ftbase.o \
+		ftdebug.o \
+		ftglyph.o \
+		ftinit.o \
+		ftmm.o \
+		cff.o \
+		type1cid.o \
+		psnames.o \
+		psmodule.o \
+		raster1.o \
+		sfnt.o \
+		smooth.o \
+		truetype.o \
+		type1z.o \
+		winfnt.o
 
 JPEGOBJS    = \
 		jcomapi.o \
@@ -1288,7 +1326,7 @@ clean:
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	$(RM) ./lib/*
 	$(RM) -r ./lib/wx/*
+	$(RM) ./lib/lib*
 
 cleanall: clean