Commit 267e1d719ab7f506b410632838b9ce1b4c7c1a02
2007-01-15T07:48:09
* builds/amiga/makefile, builds/amiga/makefile.os4, builds/amiga/smakefile: Add `ftgasp.c' and `ftlcdfil.c'. * builds/amiga/include/freetype/config/ftconfig.h: Synchronize.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
diff --git a/ChangeLog b/ChangeLog
index 11ba2ca..025ac8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-15 Detlef Würkner <TetiSoft@apg.lahn.de>
+
+ * builds/amiga/makefile, builds/amiga/makefile.os4,
+ builds/amiga/smakefile: Add `ftgasp.c' and `ftlcdfil.c'.
+
+ * builds/amiga/include/freetype/config/ftconfig.h: Synchronize.
+
2007-01-14 Detlef Würkner <TetiSoft@apg.lahn.de>
Fix various compiler warnings.
diff --git a/builds/amiga/include/freetype/config/ftconfig.h b/builds/amiga/include/freetype/config/ftconfig.h
index 23d2eda..03ab700 100644
--- a/builds/amiga/include/freetype/config/ftconfig.h
+++ b/builds/amiga/include/freetype/config/ftconfig.h
@@ -4,7 +4,7 @@
/* */
/* Amiga-specific configuration file (specification only). */
/* */
-/* Copyright 2005 by */
+/* Copyright 2005, 2006, 2007 by */
/* Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -20,18 +20,14 @@
* with Amiga-specific changes. When the compiler searches this directory
* before the default directory, we can do some modifications.
*
- * Here we must change FT_BASE_DEF and FT_EXPORT_DEF so that SAS/C does
+ * Here we must change FT_EXPORT_DEF so that SAS/C does
* generate the needed XDEFs.
*/
#if 0
-#define FT_BASE_DEF( x ) extern x
#define FT_EXPORT_DEF( x ) extern x
#endif
-#undef FT_BASE_DEF
-#define FT_BASE_DEF( x ) x
-
#undef FT_EXPORT_DEF
#define FT_EXPORT_DEF( x ) x
diff --git a/builds/amiga/makefile b/builds/amiga/makefile
index fcc1efa..24e8545 100644
--- a/builds/amiga/makefile
+++ b/builds/amiga/makefile
@@ -5,7 +5,7 @@
#
-# Copyright 2005, 2006 by
+# Copyright 2005, 2006, 2007 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -93,12 +93,18 @@ ftbdf.ppc.o: $(FTSRC)/base/ftbdf.c
ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c
$(CC) -c $(CFLAGS) -o $@ $<
+ftgasp.ppc.o: $(FTSRC)/base/ftgasp.c
+ $(CC) -c $(CFLAGS) -o $@ $<
+
ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c
$(CC) -c $(CFLAGS) -o $@ $<
ftgxval.ppc.o: $(FTSRC)/base/ftgxval.c
$(CC) -c $(CFLAGS) -o $@ $<
+ftlcdfil.ppc.o: $(FTSRC)/base/ftlcdfil.c
+ $(CC) -c $(CFLAGS) -o $@ $<
+
ftmm.ppc.o: $(FTSRC)/base/ftmm.c
$(CC) -c $(CFLAGS) -o $@ $<
@@ -249,8 +255,9 @@ gxvalid.ppc.o: $(FTSRC)/gxvalid/gxvalid.c
otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c
$(CC) -c $(CFLAGS) -o $@ $<
-BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftglyph.ppc.o \
- ftgxvalid.ppc.o ftmm.ppc.o ftotval.ppc.o ftpfr.ppc.o ftstroke.ppc.o \
+BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o \
+ ftgasp.ppc.o ftglyph.ppc.o ftgxvalid.ppc.o ftlcdfil.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 407436b..6853c9f 100644
--- a/builds/amiga/makefile.os4
+++ b/builds/amiga/makefile.os4
@@ -1,10 +1,10 @@
#
-# Makefile for FreeType2 link library using gcc 3.4.3 from the
+# Makefile for FreeType2 link library using gcc 4.0.3 from the
# AmigaOS4 SDK
#
-# Copyright 2005, 2006 by
+# Copyright 2005, 2006, 2007 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -16,7 +16,7 @@
# to build from the builds/amiga directory call
#
-# make
+# make -f makefile.os4
#
# Your programs source code should start with this
# (uncomment the parts you do not need to keep the program small):
@@ -54,14 +54,12 @@ RANLIB = ppc-amigaos-ranlib
DIRFLAGS = -Iinclude -I/FT/src -I/FT/include -I/SDK/include
WARNINGS = -Wall -W -Wundef -Wpointer-arith -Wbad-function-cast \
- -Waggregate-return -Wshadow
-
-CPU = -mcpu=604e
+ -Waggregate-return -Wwrite-strings -Wshadow
OPTIONS = -DFT2_BUILD_LIBRARY -DNDEBUG -fno-builtin
OPTIMIZE = -O2 -fomit-frame-pointer -fstrength-reduce -finline-functions
-CFLAGS = $(DIRFLAGS) $(WARNINGS) $(FT2FLAGS) $(CPU) $(OPTIONS) $(OPTIMIZE)
+CFLAGS = -mcrt=clib2 $(DIRFLAGS) $(WARNINGS) $(FT2FLAGS) $(OPTIONS) $(OPTIMIZE)
#
# FreeType2 library base
@@ -98,12 +96,18 @@ ftdebug.ppc.o: FT:src/base/ftdebug.c
ftdebugpure.ppc.o: src/base/ftdebug.c
$(CC) -c $(CFLAGS) -o $@ src/base/ftdebug.c
+ftgasp.ppc.o: FT:src/base/ftgasp.c
+ $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftgasp.c
+
ftglyph.ppc.o: FT:src/base/ftglyph.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftglyph.c
ftgxval.ppc.o: FT:src/base/ftgxval.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftgxval.c
+ftlcdfil.ppc.o: FT:src/base/ftlcdfil.c
+ $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftlcdfil.c
+
ftmm.ppc.o: FT:src/base/ftmm.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftmm.c
@@ -254,8 +258,9 @@ gxvalid.ppc.o: FT:src/gxvalid/gxvalid.c
otvalid.ppc.o: FT:src/otvalid/otvalid.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/otvalid/otvalid.c
-BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftglyph.ppc.o \
- ftgxval.ppc.o ftmm.ppc.o ftotval.ppc.o ftpfr.ppc.o ftstroke.ppc.o \
+BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o \
+ ftgasp.ppc.o ftglyph.ppc.o ftgxval.ppc.o ftlcdfil.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 bc67cf4..c9209f7 100644
--- a/builds/amiga/smakefile
+++ b/builds/amiga/smakefile
@@ -3,7 +3,7 @@
#
-# Copyright 2005,2006 by
+# Copyright 2005,2006, 2007 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -42,8 +42,9 @@
# (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 ftbbox.o ftbdf.o ftbitmap.o ftglyph.o ftgxval.o ftmm.o \
- ftotval.o ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o ftxf86.o
+OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftgasp.o ftglyph.o \
+ ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpfr.o ftstroke.o \
+ ftsynth.o fttype1.o ftwinfnt.o ftxf86.o
OBJSYSTEM = ftsystem.o ftsystempure.o
@@ -130,10 +131,14 @@ ftbdf.o: $(CORE)base/ftbdf.c
sc $(SCFLAGS) objname=$@ $<
ftbitmap.o: $(CORE)base/ftbitmap.c
sc $(SCFLAGS) objname=$@ $<
+ftgasp.o: $(CORE)base/ftgasp.c
+ sc $(SCFLAGS) objname=$@ $<
ftglyph.o: $(CORE)base/ftglyph.c
sc $(SCFLAGS) objname=$@ $<
ftgxval.o: $(CORE)base/ftgxval.c
sc $(SCFLAGS) objname=$@ $<
+ftlcdfil.o: $(CORE)base/ftlcdfil.c
+ sc $(SCFLAGS) objname=$@ $<
ftmm.o: $(CORE)base/ftmm.c
sc $(SCFLAGS) objname=$@ $<
ftotval.o: $(CORE)base/ftotval.c