From 4a80d05e51da5b1cedb9f5d15f363d5c44509f6a Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 26 Mar 2005 10:18:38 +0000 Subject: [PATCH] Update of the Amiga port. * builds/amiga/makefile, builds/amiga/makefile.os4, builds/amiga/smakefile: Included the base extension files (ftbitmap.c, ftotval.c, ftpfr.c, ftstroke.c, ftxf86.c). --- ChangeLog | 8 ++++++++ builds/amiga/makefile | 20 ++++++++++++++++++-- builds/amiga/makefile.os4 | 20 ++++++++++++++++++-- builds/amiga/smakefile | 13 ++++++++++++- 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6626cf1c1..8e751b558 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-03-26 Detlef Würkner + + Update of the Amiga port. + + * builds/amiga/makefile, builds/amiga/makefile.os4, + builds/amiga/smakefile: Included the base extension files + (ftbitmap.c, ftotval.c, ftpfr.c, ftstroke.c, ftxf86.c). + 2005-03-25 Detlef Würkner Update of the Amiga port. diff --git a/builds/amiga/makefile b/builds/amiga/makefile index f2e2b1beb..4b8e64968 100644 --- a/builds/amiga/makefile +++ b/builds/amiga/makefile @@ -76,12 +76,24 @@ ftbbox.ppc.o: $(FTSRC)/base/ftbbox.c ftbdf.ppc.o: $(FTSRC)/base/ftbdf.c $(CC) -c $(CFLAGS) -o $@ $< +ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c + $(CC) -c $(CFLAGS) -o $@ $< + ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c $(CC) -c $(CFLAGS) -o $@ $< ftmm.ppc.o: $(FTSRC)/base/ftmm.c $(CC) -c $(CFLAGS) -o $@ $< +ftotval.ppc.o: $(FTSRC)/base/ftotval.c + $(CC) -c $(CFLAGS) -o $@ $< + +ftpfr.ppc.o: $(FTSRC)/base/ftpfr.c + $(CC) -c $(CFLAGS) -o $@ $< + +ftstroke.ppc.o: $(FTSRC)/base/ftstroke.c + $(CC) -c $(CFLAGS) -o $@ $< + ftsynth.ppc.o: $(FTSRC)/base/ftsynth.c $(CC) -c $(CFLAGS) -o $@ $< @@ -91,6 +103,9 @@ fttype1.ppc.o: $(FTSRC)/base/fttype1.c ftwinfnt.ppc.o: $(FTSRC)/base/ftwinfnt.c $(CC) -c $(CFLAGS) -o $@ $< +ftxf86.ppc.o: $(FTSRC)/base/ftxf86.c + $(CC) -c $(CFLAGS) -o $@ $< + # # FreeType2 library autofitting module # @@ -211,8 +226,9 @@ winfnt.ppc.o: $(FTSRC)/winfonts/winfnt.c otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c $(CC) -c $(CFLAGS) -o $@ $< -BASEPPC = ftbase.ppc.o ftbdf.ppc.o ftglyph.ppc.o ftbbox.ppc.o ftmm.ppc.o\ - ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o +BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftglyph.ppc.o \ + ftmm.ppc.o ftotval.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o \ + fttype1.ppc.o ftwinfnt.ppc.o ftxf86.ppc.o DEBUGPPC = ftdebug.ppc.o ftdebugpure.ppc.o diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4 index 99f226831..508e96136 100644 --- a/builds/amiga/makefile.os4 +++ b/builds/amiga/makefile.os4 @@ -75,6 +75,9 @@ ftbbox.ppc.o: FT:src/base/ftbbox.c ftbdf.ppc.o: FT:src/base/ftbdf.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftbdf.c +ftbitmap.ppc.o: FT:src/base/ftbitmap.c + $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftbitmap.c + ftdebug.ppc.o: FT:src/base/ftdebug.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftdebug.c @@ -88,6 +91,15 @@ ftglyph.ppc.o: FT:src/base/ftglyph.c ftmm.ppc.o: FT:src/base/ftmm.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftmm.c +ftotval.ppc.o: FT:src/base/ftotval.c + $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftotval.c + +ftpfr.ppc.o: FT:src/base/ftpfr.c + $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftpfr.c + +ftstroke.ppc.o: FT:src/base/ftstroke.c + $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftstroke.c + ftsynth.ppc.o: FT:src/base/ftsynth.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftsynth.c @@ -97,6 +109,9 @@ fttype1.ppc.o: FT:src/base/fttype1.c ftwinfnt.ppc.o: FT:src/base/ftwinfnt.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftwinfnt.c +ftxf86.ppc.o: FT:src/base/ftxf86.c + $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftxf86.c + # # FreeType2 library autofitting module # @@ -217,8 +232,9 @@ winfnt.ppc.o: FT:src/winfonts/winfnt.c otvalid.ppc.o: FT:src/otvalid/otvalid.c $(CC) -c $(CFLAGS) -o $@ /FT/src/otvalid/otvalid.c -BASE = ftbase.ppc.o ftbdf.ppc.o ftglyph.ppc.o ftbbox.ppc.o ftmm.ppc.o\ - ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o +BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftglyph.ppc.o \ + ftmm.ppc.o ftotval.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o \ + fttype1.ppc.o ftwinfnt.ppc.o ftxf86.ppc.o DEBUG = ftdebug.ppc.o ftdebugpure.ppc.o diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile index 5b39bb048..8bc27bd16 100644 --- a/builds/amiga/smakefile +++ b/builds/amiga/smakefile @@ -29,7 +29,8 @@ # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or # FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h). -OBJBASE = ftbase.o ftbdf.o ftglyph.o ftbbox.o ftmm.o ftsynth.o fttype1.o ftwinfnt.o +OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftglyph.o ftmm.o ftotval.o \ + ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o ftxf86.o OBJSYSTEM = ftsystem.o ftsystempure.o @@ -112,16 +113,26 @@ ftbbox.o: $(CORE)base/ftbbox.c sc $(SCFLAGS) objname=$@ $< ftbdf.o: $(CORE)base/ftbdf.c sc $(SCFLAGS) objname=$@ $< +ftbitmap.o: $(CORE)base/ftbitmap.c + sc $(SCFLAGS) objname=$@ $< ftglyph.o: $(CORE)base/ftglyph.c sc $(SCFLAGS) objname=$@ $< ftmm.o: $(CORE)base/ftmm.c sc $(SCFLAGS) objname=$@ $< +ftotval.o: $(CORE)base/ftotval.c + sc $(SCFLAGS) objname=$@ $< +ftpfr.o: $(CORE)base/ftpfr.c + sc $(SCFLAGS) objname=$@ $< +ftstroke.o: $(CORE)base/ftstroke.c + sc $(SCFLAGS) objname=$@ $< ftsynth.o: $(CORE)base/ftsynth.c sc $(SCFLAGS) objname=$@ $< fttype1.o: $(CORE)base/fttype1.c sc $(SCFLAGS) objname=$@ $< ftwinfnt.o: $(CORE)base/ftwinfnt.c sc $(SCFLAGS) objname=$@ $< +ftxf86.o: $(CORE)base/ftxf86.c + sc $(SCFLAGS) objname=$@ $< # # freetype library autofitter module