shithub: freetype+ttf2subf

Download patch

ref: 6b1c597cbad00e5309a3cf0ab815b3a15c705bb3
parent: c815f33b853eb219e50c8061ccead02d7640cb49
author: Suzuki, Toshiya (鈴木俊哉) <[email protected]>
date: Thu Nov 24 00:16:57 EST 2005

MPW makefiles are updated to build all available modules

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-24  suzuki toshiya <[email protected]>
+
+	* builds/mac/FreeType.m68k_far.make.txt,
+	builds/mac/FreeType.m68k_cfm.make.txt,
+	builds/mac/FreeType.ppc_classic.make.txt,
+	builds/mac/FreeType.ppc_carbon.make.txt:
+	Updated for MPW to build all available modules.
+
 2005-11-21  H�vard Wall  <[email protected]>
 
 	* src/bdf/bdfdrivr.c (bdf_interpret_style, BDF_Face_Done): Fix small
--- a/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/builds/mac/FreeType.m68k_cfm.make.txt
@@ -21,49 +21,89 @@
 ### Source Files ###
 
 SrcFiles        =  \xB6
-				  :src:base:ftsystem.c \xB6
-				  :src:base:ftdebug.c \xB6
-				  :src:base:ftinit.c \xB6
+				  :src:autofit:autofit.c \xB6
 				  :src:base:ftbase.c \xB6
+				  :src:base:ftbbox.c \xB6
+				  :src:base:ftbdf.c \xB6
+				  :src:base:ftbitmap.c \xB6
+				  :src:base:ftdebug.c \xB6
 				  :src:base:ftglyph.c \xB6
+				  :src:base:ftgxval.c \xB6
+				  :src:base:ftinit.c \xB6
+				  :src:base:ftmac.c \xB6
 				  :src:base:ftmm.c \xB6
-				  :src:base:ftbbox.c \xB6
+				  :src:base:ftotval.c \xB6
+				  :src:base:ftpfr.c \xB6
+				  :src:base:ftstroke.c \xB6
+				  :src:base:ftsynth.c \xB6
+				  :src:base:ftsystem.c \xB6
+				  :src:base:fttype1.c \xB6
+				  :src:base:ftwinfnt.c \xB6
+				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
+				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
 				  :src:cid:type1cid.c \xB6
+				  :src:gxvalid:gxvalid.c \xB6
+				  :src:gzip:ftgzip.c \xB6
+				  :src:lzw:ftlzw2.c \xB6
+				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
+				  :src:pfr:pfr.c \xB6
 				  :src:psaux:psaux.c \xB6
+				  :src:pshinter:pshinter.c \xB6
 				  :src:psnames:psmodule.c \xB6
+				  :src:raster:raster.c \xB6
 				  :src:sfnt:sfnt.c \xB6
 				  :src:smooth:smooth.c \xB6
 				  :src:truetype:truetype.c \xB6
 				  :src:type1:type1.c \xB6
-				  :src:winfonts:winfnt.c \xB6
-				  :src:base:ftmac.c
+				  :src:type42:type42.c \xB6
+				  :src:winfonts:winfnt.c
 
 
 ### Object Files ###
 
 ObjFiles-68K    =  \xB6
-				  "{ObjDir}ftsystem.c.o" \xB6
-				  "{ObjDir}ftdebug.c.o" \xB6
-				  "{ObjDir}ftinit.c.o" \xB6
+				  "{ObjDir}autofit.c.o" \xB6
 				  "{ObjDir}ftbase.c.o" \xB6
+				  "{ObjDir}ftbbox.c.o" \xB6
+				  "{ObjDir}ftbdf.c.o" \xB6
+				  "{ObjDir}ftbitmap.c.o" \xB6
+				  "{ObjDir}ftdebug.c.o" \xB6
 				  "{ObjDir}ftglyph.c.o" \xB6
+				  "{ObjDir}ftgxval.c.o" \xB6
+				  "{ObjDir}ftinit.c.o" \xB6
+				  "{ObjDir}ftmac.c.o" \xB6
 				  "{ObjDir}ftmm.c.o" \xB6
-				  "{ObjDir}ftbbox.c.o" \xB6
+				  "{ObjDir}ftotval.c.o" \xB6
+				  "{ObjDir}ftpfr.c.o" \xB6
+				  "{ObjDir}ftstroke.c.o" \xB6
+				  "{ObjDir}ftsynth.c.o" \xB6
+				  "{ObjDir}ftsystem.c.o" \xB6
+				  "{ObjDir}fttype1.c.o" \xB6
+				  "{ObjDir}ftwinfnt.c.o" \xB6
+				  "{ObjDir}ftxf86.c.o" \xB6
 				  "{ObjDir}ftcache.c.o" \xB6
+				  "{ObjDir}bdf.c.o" \xB6
 				  "{ObjDir}cff.c.o" \xB6
 				  "{ObjDir}type1cid.c.o" \xB6
+				  "{ObjDir}gxvalid.c.o" \xB6
+				  "{ObjDir}ftgzip.c.o" \xB6
+				  "{ObjDir}ftlzw2.c.o" \xB6
+				  "{ObjDir}otvalid.c.o" \xB6
 				  "{ObjDir}pcf.c.o" \xB6
+				  "{ObjDir}pfr.c.o" \xB6
 				  "{ObjDir}psaux.c.o" \xB6
+				  "{ObjDir}pshinter.c.o" \xB6
 				  "{ObjDir}psmodule.c.o" \xB6
+				  "{ObjDir}raster.c.o" \xB6
 				  "{ObjDir}sfnt.c.o" \xB6
 				  "{ObjDir}smooth.c.o" \xB6
 				  "{ObjDir}truetype.c.o" \xB6
 				  "{ObjDir}type1.c.o" \xB6
-				  "{ObjDir}winfnt.c.o" \xB6
-				  "{ObjDir}ftmac.c.o"
+				  "{ObjDir}type42.c.o" \xB6
+				  "{ObjDir}winfnt.c.o"
 
 
 ### Libraries ###
@@ -93,25 +133,45 @@
 
 ### Required Dependencies ###
 
-"{ObjDir}ftsystem.c.o"  \xC4  :src:base:ftsystem.c
-"{ObjDir}ftdebug.c.o"  \xC4  :src:base:ftdebug.c
-"{ObjDir}ftinit.c.o"  \xC4  :src:base:ftinit.c
-"{ObjDir}ftbase.c.o"  \xC4  :src:base:ftbase.c
-"{ObjDir}ftglyph.c.o"  \xC4  :src:base:ftglyph.c
-"{ObjDir}ftmm.c.o"  \xC4  :src:base:ftmm.c
-"{ObjDir}ftbbox.c.o"  \xC4  :src:base:ftbbox.c
-"{ObjDir}ftcache.c.o"  \xC4  :src:cache:ftcache.c
-"{ObjDir}cff.c.o"  \xC4  :src:cff:cff.c
-"{ObjDir}type1cid.c.o"  \xC4  :src:cid:type1cid.c
-"{ObjDir}pcf.c.o"  \xC4  :src:pcf:pcf.c
-"{ObjDir}psaux.c.o"  \xC4  :src:psaux:psaux.c
-"{ObjDir}psmodule.c.o"  \xC4  :src:psnames:psmodule.c
-"{ObjDir}sfnt.c.o"  \xC4  :src:sfnt:sfnt.c
-"{ObjDir}smooth.c.o"  \xC4  :src:smooth:smooth.c
-"{ObjDir}truetype.c.o"  \xC4  :src:truetype:truetype.c
-"{ObjDir}type1.c.o"  \xC4  :src:type1:type1.c
-"{ObjDir}winfnt.c.o"  \xC4  :src:winfonts:winfnt.c
-"{ObjDir}ftmac.c.o"  \xC4  :src:base:ftmac.c
+"{ObjDir}autofit.c.o" \xC4 :src:autofit:autofit.c
+"{ObjDir}ftbase.c.o" \xC4 :src:base:ftbase.c
+"{ObjDir}ftbbox.c.o" \xC4 :src:base:ftbbox.c
+"{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c
+"{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c
+"{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c
+"{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c
+"{ObjDir}ftinit.c.o" \xC4 :src:base:ftinit.c
+"{ObjDir}ftmac.c.o" \xC4 :src:base:ftmac.c
+"{ObjDir}ftmm.c.o" \xC4 :src:base:ftmm.c
+"{ObjDir}ftotval.c.o" \xC4 :src:base:ftotval.c
+"{ObjDir}ftpfr.c.o" \xC4 :src:base:ftpfr.c
+"{ObjDir}ftstroke.c.o" \xC4 :src:base:ftstroke.c
+"{ObjDir}ftsynth.c.o" \xC4 :src:base:ftsynth.c
+"{ObjDir}ftsystem.c.o" \xC4 :src:base:ftsystem.c
+"{ObjDir}fttype1.c.o" \xC4 :src:base:fttype1.c
+"{ObjDir}ftwinfnt.c.o" \xC4 :src:base:ftwinfnt.c
+"{ObjDir}ftxf86.c.o" \xC4 :src:base:ftxf86.c
+"{ObjDir}ftcache.c.o" \xC4 :src:cache:ftcache.c
+"{ObjDir}bdf.c.o" \xC4 :src:bdf:bdf.c
+"{ObjDir}cff.c.o" \xC4 :src:cff:cff.c
+"{ObjDir}type1cid.c.o" \xC4 :src:cid:type1cid.c
+"{ObjDir}gxvalid.c.o" \xC4 :src:gxvalid:gxvalid.c
+"{ObjDir}ftgzip.c.o" \xC4 :src:gzip:ftgzip.c
+"{ObjDir}ftlzw2.c.o" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}otvalid.c.o" \xC4 :src:otvalid:otvalid.c
+"{ObjDir}pcf.c.o" \xC4 :src:pcf:pcf.c
+"{ObjDir}pfr.c.o" \xC4 :src:pfr:pfr.c
+"{ObjDir}psaux.c.o" \xC4 :src:psaux:psaux.c
+"{ObjDir}pshinter.c.o" \xC4 :src:pshinter:pshinter.c
+"{ObjDir}psmodule.c.o" \xC4 :src:psnames:psmodule.c
+"{ObjDir}raster.c.o" \xC4 :src:raster:raster.c
+"{ObjDir}sfnt.c.o" \xC4 :src:sfnt:sfnt.c
+"{ObjDir}smooth.c.o" \xC4 :src:smooth:smooth.c
+"{ObjDir}truetype.c.o" \xC4 :src:truetype:truetype.c
+"{ObjDir}type1.c.o" \xC4 :src:type1:type1.c
+"{ObjDir}type42.c.o" \xC4 :src:type42:type42.c
+"{ObjDir}winfnt.c.o" \xC4 :src:winfonts:winfnt.c
 
 
 ### Optional Dependencies ###
--- a/builds/mac/FreeType.m68k_far.make.txt
+++ b/builds/mac/FreeType.m68k_far.make.txt
@@ -21,49 +21,89 @@
 ### Source Files ###
 
 SrcFiles        =  \xB6
-				  :src:base:ftsystem.c \xB6
-				  :src:base:ftdebug.c \xB6
-				  :src:base:ftinit.c \xB6
+				  :src:autofit:autofit.c \xB6
 				  :src:base:ftbase.c \xB6
+				  :src:base:ftbbox.c \xB6
+				  :src:base:ftbdf.c \xB6
+				  :src:base:ftbitmap.c \xB6
+				  :src:base:ftdebug.c \xB6
 				  :src:base:ftglyph.c \xB6
+				  :src:base:ftgxval.c \xB6
+				  :src:base:ftinit.c \xB6
+				  :src:base:ftmac.c \xB6
 				  :src:base:ftmm.c \xB6
-				  :src:base:ftbbox.c \xB6
+				  :src:base:ftotval.c \xB6
+				  :src:base:ftpfr.c \xB6
+				  :src:base:ftstroke.c \xB6
+				  :src:base:ftsynth.c \xB6
+				  :src:base:ftsystem.c \xB6
+				  :src:base:fttype1.c \xB6
+				  :src:base:ftwinfnt.c \xB6
+				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
+				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
 				  :src:cid:type1cid.c \xB6
+				  :src:gxvalid:gxvalid.c \xB6
+				  :src:gzip:ftgzip.c \xB6
+				  :src:lzw:ftlzw2.c \xB6
+				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
+				  :src:pfr:pfr.c \xB6
 				  :src:psaux:psaux.c \xB6
+				  :src:pshinter:pshinter.c \xB6
 				  :src:psnames:psmodule.c \xB6
+				  :src:raster:raster.c \xB6
 				  :src:sfnt:sfnt.c \xB6
 				  :src:smooth:smooth.c \xB6
 				  :src:truetype:truetype.c \xB6
 				  :src:type1:type1.c \xB6
-				  :src:winfonts:winfnt.c \xB6
-				  :src:base:ftmac.c
+				  :src:type42:type42.c \xB6
+				  :src:winfonts:winfnt.c
 
 
 ### Object Files ###
 
 ObjFiles-68K    =  \xB6
-				  "{ObjDir}ftsystem.c.o" \xB6
-				  "{ObjDir}ftdebug.c.o" \xB6
-				  "{ObjDir}ftinit.c.o" \xB6
+				  "{ObjDir}autofit.c.o" \xB6
 				  "{ObjDir}ftbase.c.o" \xB6
+				  "{ObjDir}ftbbox.c.o" \xB6
+				  "{ObjDir}ftbdf.c.o" \xB6
+				  "{ObjDir}ftbitmap.c.o" \xB6
+				  "{ObjDir}ftdebug.c.o" \xB6
 				  "{ObjDir}ftglyph.c.o" \xB6
+				  "{ObjDir}ftgxval.c.o" \xB6
+				  "{ObjDir}ftinit.c.o" \xB6
+				  "{ObjDir}ftmac.c.o" \xB6
 				  "{ObjDir}ftmm.c.o" \xB6
-				  "{ObjDir}ftbbox.c.o" \xB6
+				  "{ObjDir}ftotval.c.o" \xB6
+				  "{ObjDir}ftpfr.c.o" \xB6
+				  "{ObjDir}ftstroke.c.o" \xB6
+				  "{ObjDir}ftsynth.c.o" \xB6
+				  "{ObjDir}ftsystem.c.o" \xB6
+				  "{ObjDir}fttype1.c.o" \xB6
+				  "{ObjDir}ftwinfnt.c.o" \xB6
+				  "{ObjDir}ftxf86.c.o" \xB6
 				  "{ObjDir}ftcache.c.o" \xB6
+				  "{ObjDir}bdf.c.o" \xB6
 				  "{ObjDir}cff.c.o" \xB6
 				  "{ObjDir}type1cid.c.o" \xB6
+				  "{ObjDir}gxvalid.c.o" \xB6
+				  "{ObjDir}ftgzip.c.o" \xB6
+				  "{ObjDir}ftlzw2.c.o" \xB6
+				  "{ObjDir}otvalid.c.o" \xB6
 				  "{ObjDir}pcf.c.o" \xB6
+				  "{ObjDir}pfr.c.o" \xB6
 				  "{ObjDir}psaux.c.o" \xB6
+				  "{ObjDir}pshinter.c.o" \xB6
 				  "{ObjDir}psmodule.c.o" \xB6
+				  "{ObjDir}raster.c.o" \xB6
 				  "{ObjDir}sfnt.c.o" \xB6
 				  "{ObjDir}smooth.c.o" \xB6
 				  "{ObjDir}truetype.c.o" \xB6
 				  "{ObjDir}type1.c.o" \xB6
-				  "{ObjDir}winfnt.c.o" \xB6
-				  "{ObjDir}ftmac.c.o"
+				  "{ObjDir}type42.c.o" \xB6
+				  "{ObjDir}winfnt.c.o"
 
 
 ### Libraries ###
@@ -92,25 +132,45 @@
 
 ### Required Dependencies ###
 
-"{ObjDir}ftsystem.c.o"  \xC4  :src:base:ftsystem.c
-"{ObjDir}ftdebug.c.o"  \xC4  :src:base:ftdebug.c
-"{ObjDir}ftinit.c.o"  \xC4  :src:base:ftinit.c
-"{ObjDir}ftbase.c.o"  \xC4  :src:base:ftbase.c
-"{ObjDir}ftglyph.c.o"  \xC4  :src:base:ftglyph.c
-"{ObjDir}ftmm.c.o"  \xC4  :src:base:ftmm.c
-"{ObjDir}ftbbox.c.o"  \xC4  :src:base:ftbbox.c
-"{ObjDir}ftcache.c.o"  \xC4  :src:cache:ftcache.c
-"{ObjDir}cff.c.o"  \xC4  :src:cff:cff.c
-"{ObjDir}type1cid.c.o"  \xC4  :src:cid:type1cid.c
-"{ObjDir}pcf.c.o"  \xC4  :src:pcf:pcf.c
-"{ObjDir}psaux.c.o"  \xC4  :src:psaux:psaux.c
-"{ObjDir}psmodule.c.o"  \xC4  :src:psnames:psmodule.c
-"{ObjDir}sfnt.c.o"  \xC4  :src:sfnt:sfnt.c
-"{ObjDir}smooth.c.o"  \xC4  :src:smooth:smooth.c
-"{ObjDir}truetype.c.o"  \xC4  :src:truetype:truetype.c
-"{ObjDir}type1.c.o"  \xC4  :src:type1:type1.c
-"{ObjDir}winfnt.c.o"  \xC4  :src:winfonts:winfnt.c
-"{ObjDir}ftmac.c.o"  \xC4  :src:base:ftmac.c
+"{ObjDir}autofit.c.o" \xC4 :src:autofit:autofit.c
+"{ObjDir}ftbase.c.o" \xC4 :src:base:ftbase.c
+"{ObjDir}ftbbox.c.o" \xC4 :src:base:ftbbox.c
+"{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c
+"{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c
+"{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c
+"{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c
+"{ObjDir}ftinit.c.o" \xC4 :src:base:ftinit.c
+"{ObjDir}ftmac.c.o" \xC4 :src:base:ftmac.c
+"{ObjDir}ftmm.c.o" \xC4 :src:base:ftmm.c
+"{ObjDir}ftotval.c.o" \xC4 :src:base:ftotval.c
+"{ObjDir}ftpfr.c.o" \xC4 :src:base:ftpfr.c
+"{ObjDir}ftstroke.c.o" \xC4 :src:base:ftstroke.c
+"{ObjDir}ftsynth.c.o" \xC4 :src:base:ftsynth.c
+"{ObjDir}ftsystem.c.o" \xC4 :src:base:ftsystem.c
+"{ObjDir}fttype1.c.o" \xC4 :src:base:fttype1.c
+"{ObjDir}ftwinfnt.c.o" \xC4 :src:base:ftwinfnt.c
+"{ObjDir}ftxf86.c.o" \xC4 :src:base:ftxf86.c
+"{ObjDir}ftcache.c.o" \xC4 :src:cache:ftcache.c
+"{ObjDir}bdf.c.o" \xC4 :src:bdf:bdf.c
+"{ObjDir}cff.c.o" \xC4 :src:cff:cff.c
+"{ObjDir}type1cid.c.o" \xC4 :src:cid:type1cid.c
+"{ObjDir}gxvalid.c.o" \xC4 :src:gxvalid:gxvalid.c
+"{ObjDir}ftgzip.c.o" \xC4 :src:gzip:ftgzip.c
+"{ObjDir}ftlzw2.c.o" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}otvalid.c.o" \xC4 :src:otvalid:otvalid.c
+"{ObjDir}pcf.c.o" \xC4 :src:pcf:pcf.c
+"{ObjDir}pfr.c.o" \xC4 :src:pfr:pfr.c
+"{ObjDir}psaux.c.o" \xC4 :src:psaux:psaux.c
+"{ObjDir}pshinter.c.o" \xC4 :src:pshinter:pshinter.c
+"{ObjDir}psmodule.c.o" \xC4 :src:psnames:psmodule.c
+"{ObjDir}raster.c.o" \xC4 :src:raster:raster.c
+"{ObjDir}sfnt.c.o" \xC4 :src:sfnt:sfnt.c
+"{ObjDir}smooth.c.o" \xC4 :src:smooth:smooth.c
+"{ObjDir}truetype.c.o" \xC4 :src:truetype:truetype.c
+"{ObjDir}type1.c.o" \xC4 :src:type1:type1.c
+"{ObjDir}type42.c.o" \xC4 :src:type42:type42.c
+"{ObjDir}winfnt.c.o" \xC4 :src:winfonts:winfnt.c
 
 
 ### Optional Dependencies ###
--- a/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/builds/mac/FreeType.ppc_carbon.make.txt
@@ -21,49 +21,89 @@
 ### Source Files ###
 
 SrcFiles        =  \xB6
-				  :src:base:ftsystem.c \xB6
-				  :src:base:ftdebug.c \xB6
-				  :src:base:ftinit.c \xB6
+				  :src:autofit:autofit.c \xB6
 				  :src:base:ftbase.c \xB6
+				  :src:base:ftbbox.c \xB6
+				  :src:base:ftbdf.c \xB6
+				  :src:base:ftbitmap.c \xB6
+				  :src:base:ftdebug.c \xB6
 				  :src:base:ftglyph.c \xB6
+				  :src:base:ftgxval.c \xB6
+				  :src:base:ftinit.c \xB6
+				  :src:base:ftmac.c \xB6
 				  :src:base:ftmm.c \xB6
-				  :src:base:ftbbox.c \xB6
+				  :src:base:ftotval.c \xB6
+				  :src:base:ftpfr.c \xB6
+				  :src:base:ftstroke.c \xB6
+				  :src:base:ftsynth.c \xB6
+				  :src:base:ftsystem.c \xB6
+				  :src:base:fttype1.c \xB6
+				  :src:base:ftwinfnt.c \xB6
+				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
+				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
 				  :src:cid:type1cid.c \xB6
+				  :src:gxvalid:gxvalid.c \xB6
+				  :src:gzip:ftgzip.c \xB6
+				  :src:lzw:ftlzw2.c \xB6
+				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
+				  :src:pfr:pfr.c \xB6
 				  :src:psaux:psaux.c \xB6
+				  :src:pshinter:pshinter.c \xB6
 				  :src:psnames:psmodule.c \xB6
+				  :src:raster:raster.c \xB6
 				  :src:sfnt:sfnt.c \xB6
 				  :src:smooth:smooth.c \xB6
 				  :src:truetype:truetype.c \xB6
 				  :src:type1:type1.c \xB6
-				  :src:winfonts:winfnt.c \xB6
-				  :src:base:ftmac.c
+				  :src:type42:type42.c \xB6
+				  :src:winfonts:winfnt.c
 
 
 ### Object Files ###
 
 ObjFiles-PPC    =  \xB6
-				  "{ObjDir}ftsystem.c.x" \xB6
-				  "{ObjDir}ftdebug.c.x" \xB6
-				  "{ObjDir}ftinit.c.x" \xB6
+				  "{ObjDir}autofit.c.x" \xB6
 				  "{ObjDir}ftbase.c.x" \xB6
+				  "{ObjDir}ftbbox.c.x" \xB6
+				  "{ObjDir}ftbdf.c.x" \xB6
+				  "{ObjDir}ftbitmap.c.x" \xB6
+				  "{ObjDir}ftdebug.c.x" \xB6
 				  "{ObjDir}ftglyph.c.x" \xB6
+				  "{ObjDir}ftgxval.c.x" \xB6
+				  "{ObjDir}ftinit.c.x" \xB6
+				  "{ObjDir}ftmac.c.x" \xB6
 				  "{ObjDir}ftmm.c.x" \xB6
-				  "{ObjDir}ftbbox.c.x" \xB6
+				  "{ObjDir}ftotval.c.x" \xB6
+				  "{ObjDir}ftpfr.c.x" \xB6
+				  "{ObjDir}ftstroke.c.x" \xB6
+				  "{ObjDir}ftsynth.c.x" \xB6
+				  "{ObjDir}ftsystem.c.x" \xB6
+				  "{ObjDir}fttype1.c.x" \xB6
+				  "{ObjDir}ftwinfnt.c.x" \xB6
+				  "{ObjDir}ftxf86.c.x" \xB6
 				  "{ObjDir}ftcache.c.x" \xB6
+				  "{ObjDir}bdf.c.x" \xB6
 				  "{ObjDir}cff.c.x" \xB6
 				  "{ObjDir}type1cid.c.x" \xB6
+				  "{ObjDir}gxvalid.c.x" \xB6
+				  "{ObjDir}ftgzip.c.x" \xB6
+				  "{ObjDir}ftlzw2.c.x" \xB6
+				  "{ObjDir}otvalid.c.x" \xB6
 				  "{ObjDir}pcf.c.x" \xB6
+				  "{ObjDir}pfr.c.x" \xB6
 				  "{ObjDir}psaux.c.x" \xB6
+				  "{ObjDir}pshinter.c.x" \xB6
 				  "{ObjDir}psmodule.c.x" \xB6
+				  "{ObjDir}raster.c.x" \xB6
 				  "{ObjDir}sfnt.c.x" \xB6
 				  "{ObjDir}smooth.c.x" \xB6
 				  "{ObjDir}truetype.c.x" \xB6
 				  "{ObjDir}type1.c.x" \xB6
-				  "{ObjDir}winfnt.c.x" \xB6
-				  "{ObjDir}ftmac.c.x"
+				  "{ObjDir}type42.c.x" \xB6
+				  "{ObjDir}winfnt.c.x"
 
 
 ### Libraries ###
@@ -96,25 +136,45 @@
 
 ### Required Dependencies ###
 
-"{ObjDir}ftsystem.c.x"  \xC4  :src:base:ftsystem.c
-"{ObjDir}ftdebug.c.x"  \xC4  :src:base:ftdebug.c
-"{ObjDir}ftinit.c.x"  \xC4  :src:base:ftinit.c
-"{ObjDir}ftbase.c.x"  \xC4  :src:base:ftbase.c
-"{ObjDir}ftglyph.c.x"  \xC4  :src:base:ftglyph.c
-"{ObjDir}ftmm.c.x"  \xC4  :src:base:ftmm.c
-"{ObjDir}ftbbox.c.x"  \xC4  :src:base:ftbbox.c
-"{ObjDir}ftcache.c.x"  \xC4  :src:cache:ftcache.c
-"{ObjDir}cff.c.x"  \xC4  :src:cff:cff.c
-"{ObjDir}type1cid.c.x"  \xC4  :src:cid:type1cid.c
-"{ObjDir}pcf.c.x"  \xC4  :src:pcf:pcf.c
-"{ObjDir}psaux.c.x"  \xC4  :src:psaux:psaux.c
-"{ObjDir}psmodule.c.x"  \xC4  :src:psnames:psmodule.c
-"{ObjDir}sfnt.c.x"  \xC4  :src:sfnt:sfnt.c
-"{ObjDir}smooth.c.x"  \xC4  :src:smooth:smooth.c
-"{ObjDir}truetype.c.x"  \xC4  :src:truetype:truetype.c
-"{ObjDir}type1.c.x"  \xC4  :src:type1:type1.c
-"{ObjDir}winfnt.c.x"  \xC4  :src:winfonts:winfnt.c
-"{ObjDir}ftmac.c.x"  \xC4  :src:base:ftmac.c
+"{ObjDir}autofit.c.x" \xC4 :src:autofit:autofit.c
+"{ObjDir}ftbase.c.x" \xC4 :src:base:ftbase.c
+"{ObjDir}ftbbox.c.x" \xC4 :src:base:ftbbox.c
+"{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c
+"{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c
+"{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c
+"{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c
+"{ObjDir}ftinit.c.x" \xC4 :src:base:ftinit.c
+"{ObjDir}ftmac.c.x" \xC4 :src:base:ftmac.c
+"{ObjDir}ftmm.c.x" \xC4 :src:base:ftmm.c
+"{ObjDir}ftotval.c.x" \xC4 :src:base:ftotval.c
+"{ObjDir}ftpfr.c.x" \xC4 :src:base:ftpfr.c
+"{ObjDir}ftstroke.c.x" \xC4 :src:base:ftstroke.c
+"{ObjDir}ftsynth.c.x" \xC4 :src:base:ftsynth.c
+"{ObjDir}ftsystem.c.x" \xC4 :src:base:ftsystem.c
+"{ObjDir}fttype1.c.x" \xC4 :src:base:fttype1.c
+"{ObjDir}ftwinfnt.c.x" \xC4 :src:base:ftwinfnt.c
+"{ObjDir}ftxf86.c.x" \xC4 :src:base:ftxf86.c
+"{ObjDir}ftcache.c.x" \xC4 :src:cache:ftcache.c
+"{ObjDir}bdf.c.x" \xC4 :src:bdf:bdf.c
+"{ObjDir}cff.c.x" \xC4 :src:cff:cff.c
+"{ObjDir}type1cid.c.x" \xC4 :src:cid:type1cid.c
+"{ObjDir}gxvalid.c.x" \xC4 :src:gxvalid:gxvalid.c
+"{ObjDir}ftgzip.c.x" \xC4 :src:gzip:ftgzip.c
+"{ObjDir}ftlzw2.c.x" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}otvalid.c.x" \xC4 :src:otvalid:otvalid.c
+"{ObjDir}pcf.c.x" \xC4 :src:pcf:pcf.c
+"{ObjDir}pfr.c.x" \xC4 :src:pfr:pfr.c
+"{ObjDir}psaux.c.x" \xC4 :src:psaux:psaux.c
+"{ObjDir}pshinter.c.x" \xC4 :src:pshinter:pshinter.c
+"{ObjDir}psmodule.c.x" \xC4 :src:psnames:psmodule.c
+"{ObjDir}raster.c.x" \xC4 :src:raster:raster.c
+"{ObjDir}sfnt.c.x" \xC4 :src:sfnt:sfnt.c
+"{ObjDir}smooth.c.x" \xC4 :src:smooth:smooth.c
+"{ObjDir}truetype.c.x" \xC4 :src:truetype:truetype.c
+"{ObjDir}type1.c.x" \xC4 :src:type1:type1.c
+"{ObjDir}type42.c.x" \xC4 :src:type42:type42.c
+"{ObjDir}winfnt.c.x" \xC4 :src:winfonts:winfnt.c
 
 
 ### Optional Dependencies ###
--- a/builds/mac/FreeType.ppc_classic.make.txt
+++ b/builds/mac/FreeType.ppc_classic.make.txt
@@ -21,49 +21,89 @@
 ### Source Files ###
 
 SrcFiles        =  \xB6
-				  :src:base:ftsystem.c \xB6
-				  :src:base:ftdebug.c \xB6
-				  :src:base:ftinit.c \xB6
+				  :src:autofit:autofit.c \xB6
 				  :src:base:ftbase.c \xB6
+				  :src:base:ftbbox.c \xB6
+				  :src:base:ftbdf.c \xB6
+				  :src:base:ftbitmap.c \xB6
+				  :src:base:ftdebug.c \xB6
 				  :src:base:ftglyph.c \xB6
+				  :src:base:ftgxval.c \xB6
+				  :src:base:ftinit.c \xB6
+				  :src:base:ftmac.c \xB6
 				  :src:base:ftmm.c \xB6
-				  :src:base:ftbbox.c \xB6
+				  :src:base:ftotval.c \xB6
+				  :src:base:ftpfr.c \xB6
+				  :src:base:ftstroke.c \xB6
+				  :src:base:ftsynth.c \xB6
+				  :src:base:ftsystem.c \xB6
+				  :src:base:fttype1.c \xB6
+				  :src:base:ftwinfnt.c \xB6
+				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
+				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
 				  :src:cid:type1cid.c \xB6
+				  :src:gxvalid:gxvalid.c \xB6
+				  :src:gzip:ftgzip.c \xB6
+				  :src:lzw:ftlzw2.c \xB6
+				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
+				  :src:pfr:pfr.c \xB6
 				  :src:psaux:psaux.c \xB6
+				  :src:pshinter:pshinter.c \xB6
 				  :src:psnames:psmodule.c \xB6
+				  :src:raster:raster.c \xB6
 				  :src:sfnt:sfnt.c \xB6
 				  :src:smooth:smooth.c \xB6
 				  :src:truetype:truetype.c \xB6
 				  :src:type1:type1.c \xB6
-				  :src:winfonts:winfnt.c \xB6
-				  :src:base:ftmac.c
+				  :src:type42:type42.c \xB6
+				  :src:winfonts:winfnt.c
 
 
 ### Object Files ###
 
 ObjFiles-PPC    =  \xB6
-				  "{ObjDir}ftsystem.c.x" \xB6
-				  "{ObjDir}ftdebug.c.x" \xB6
-				  "{ObjDir}ftinit.c.x" \xB6
+				  "{ObjDir}autofit.c.x" \xB6
 				  "{ObjDir}ftbase.c.x" \xB6
+				  "{ObjDir}ftbbox.c.x" \xB6
+				  "{ObjDir}ftbdf.c.x" \xB6
+				  "{ObjDir}ftbitmap.c.x" \xB6
+				  "{ObjDir}ftdebug.c.x" \xB6
 				  "{ObjDir}ftglyph.c.x" \xB6
+				  "{ObjDir}ftgxval.c.x" \xB6
+				  "{ObjDir}ftinit.c.x" \xB6
+				  "{ObjDir}ftmac.c.x" \xB6
 				  "{ObjDir}ftmm.c.x" \xB6
-				  "{ObjDir}ftbbox.c.x" \xB6
+				  "{ObjDir}ftotval.c.x" \xB6
+				  "{ObjDir}ftpfr.c.x" \xB6
+				  "{ObjDir}ftstroke.c.x" \xB6
+				  "{ObjDir}ftsynth.c.x" \xB6
+				  "{ObjDir}ftsystem.c.x" \xB6
+				  "{ObjDir}fttype1.c.x" \xB6
+				  "{ObjDir}ftwinfnt.c.x" \xB6
+				  "{ObjDir}ftxf86.c.x" \xB6
 				  "{ObjDir}ftcache.c.x" \xB6
+				  "{ObjDir}bdf.c.x" \xB6
 				  "{ObjDir}cff.c.x" \xB6
 				  "{ObjDir}type1cid.c.x" \xB6
+				  "{ObjDir}gxvalid.c.x" \xB6
+				  "{ObjDir}ftgzip.c.x" \xB6
+				  "{ObjDir}ftlzw2.c.x" \xB6
+				  "{ObjDir}otvalid.c.x" \xB6
 				  "{ObjDir}pcf.c.x" \xB6
+				  "{ObjDir}pfr.c.x" \xB6
 				  "{ObjDir}psaux.c.x" \xB6
+				  "{ObjDir}pshinter.c.x" \xB6
 				  "{ObjDir}psmodule.c.x" \xB6
+				  "{ObjDir}raster.c.x" \xB6
 				  "{ObjDir}sfnt.c.x" \xB6
 				  "{ObjDir}smooth.c.x" \xB6
 				  "{ObjDir}truetype.c.x" \xB6
 				  "{ObjDir}type1.c.x" \xB6
-				  "{ObjDir}winfnt.c.x" \xB6
-				  "{ObjDir}ftmac.c.x"
+				  "{ObjDir}type42.c.x" \xB6
+				  "{ObjDir}winfnt.c.x"
 
 
 ### Libraries ###
@@ -96,25 +136,45 @@
 
 ### Required Dependencies ###
 
-"{ObjDir}ftsystem.c.x"  \xC4  :src:base:ftsystem.c
-"{ObjDir}ftdebug.c.x"  \xC4  :src:base:ftdebug.c
-"{ObjDir}ftinit.c.x"  \xC4  :src:base:ftinit.c
-"{ObjDir}ftbase.c.x"  \xC4  :src:base:ftbase.c
-"{ObjDir}ftglyph.c.x"  \xC4  :src:base:ftglyph.c
-"{ObjDir}ftmm.c.x"  \xC4  :src:base:ftmm.c
-"{ObjDir}ftbbox.c.x"  \xC4  :src:base:ftbbox.c
-"{ObjDir}ftcache.c.x"  \xC4  :src:cache:ftcache.c
-"{ObjDir}cff.c.x"  \xC4  :src:cff:cff.c
-"{ObjDir}type1cid.c.x"  \xC4  :src:cid:type1cid.c
-"{ObjDir}pcf.c.x"  \xC4  :src:pcf:pcf.c
-"{ObjDir}psaux.c.x"  \xC4  :src:psaux:psaux.c
-"{ObjDir}psmodule.c.x"  \xC4  :src:psnames:psmodule.c
-"{ObjDir}sfnt.c.x"  \xC4  :src:sfnt:sfnt.c
-"{ObjDir}smooth.c.x"  \xC4  :src:smooth:smooth.c
-"{ObjDir}truetype.c.x"  \xC4  :src:truetype:truetype.c
-"{ObjDir}type1.c.x"  \xC4  :src:type1:type1.c
-"{ObjDir}winfnt.c.x"  \xC4  :src:winfonts:winfnt.c
-"{ObjDir}ftmac.c.x"  \xC4  :src:base:ftmac.c
+"{ObjDir}autofit.c.x" \xC4 :src:autofit:autofit.c
+"{ObjDir}ftbase.c.x" \xC4 :src:base:ftbase.c
+"{ObjDir}ftbbox.c.x" \xC4 :src:base:ftbbox.c
+"{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c
+"{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c
+"{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c
+"{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c
+"{ObjDir}ftinit.c.x" \xC4 :src:base:ftinit.c
+"{ObjDir}ftmac.c.x" \xC4 :src:base:ftmac.c
+"{ObjDir}ftmm.c.x" \xC4 :src:base:ftmm.c
+"{ObjDir}ftotval.c.x" \xC4 :src:base:ftotval.c
+"{ObjDir}ftpfr.c.x" \xC4 :src:base:ftpfr.c
+"{ObjDir}ftstroke.c.x" \xC4 :src:base:ftstroke.c
+"{ObjDir}ftsynth.c.x" \xC4 :src:base:ftsynth.c
+"{ObjDir}ftsystem.c.x" \xC4 :src:base:ftsystem.c
+"{ObjDir}fttype1.c.x" \xC4 :src:base:fttype1.c
+"{ObjDir}ftwinfnt.c.x" \xC4 :src:base:ftwinfnt.c
+"{ObjDir}ftxf86.c.x" \xC4 :src:base:ftxf86.c
+"{ObjDir}ftcache.c.x" \xC4 :src:cache:ftcache.c
+"{ObjDir}bdf.c.x" \xC4 :src:bdf:bdf.c
+"{ObjDir}cff.c.x" \xC4 :src:cff:cff.c
+"{ObjDir}type1cid.c.x" \xC4 :src:cid:type1cid.c
+"{ObjDir}gxvalid.c.x" \xC4 :src:gxvalid:gxvalid.c
+"{ObjDir}ftgzip.c.x" \xC4 :src:gzip:ftgzip.c
+"{ObjDir}ftlzw2.c.x" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}otvalid.c.x" \xC4 :src:otvalid:otvalid.c
+"{ObjDir}pcf.c.x" \xC4 :src:pcf:pcf.c
+"{ObjDir}pfr.c.x" \xC4 :src:pfr:pfr.c
+"{ObjDir}psaux.c.x" \xC4 :src:psaux:psaux.c
+"{ObjDir}pshinter.c.x" \xC4 :src:pshinter:pshinter.c
+"{ObjDir}psmodule.c.x" \xC4 :src:psnames:psmodule.c
+"{ObjDir}raster.c.x" \xC4 :src:raster:raster.c
+"{ObjDir}sfnt.c.x" \xC4 :src:sfnt:sfnt.c
+"{ObjDir}smooth.c.x" \xC4 :src:smooth:smooth.c
+"{ObjDir}truetype.c.x" \xC4 :src:truetype:truetype.c
+"{ObjDir}type1.c.x" \xC4 :src:type1:type1.c
+"{ObjDir}type42.c.x" \xC4 :src:type42:type42.c
+"{ObjDir}winfnt.c.x" \xC4 :src:winfonts:winfnt.c