rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* builds/amiga/makefile, builds/amiga/makefile.os4, 

builds/amiga/smakefile: Add `ftgasp.c' and `ftlcdfil.c'.

* builds/amiga/include/freetype/config/ftconfig.h: Synchronize.
This commit is contained in:
Werner Lemberg 2007-01-15 07:48:09 +00:00
parent 8c4120d0a3
commit 267e1d719a
5 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2007-01-14 Detlef Würkner <TetiSoft@apg.lahn.de>
Fix various compiler warnings. Fix various compiler warnings.

8
builds/amiga/include/freetype/config/ftconfig.h
View File

@ -4,7 +4,7 @@
/* */ /* */
/* Amiga-specific configuration file (specification only). */ /* Amiga-specific configuration file (specification only). */
/* */ /* */
/* Copyright 2005 by */ /* Copyright 2005, 2006, 2007 by */
/* Werner Lemberg and Detlef Würkner. */ /* Werner Lemberg and Detlef Würkner. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* 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 * with Amiga-specific changes. When the compiler searches this directory
* before the default directory, we can do some modifications. * 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. * generate the needed XDEFs.
*/ */
#if 0 #if 0
#define FT_BASE_DEF( x ) extern x
#define FT_EXPORT_DEF( x ) extern x #define FT_EXPORT_DEF( x ) extern x
#endif #endif
#undef FT_BASE_DEF
#define FT_BASE_DEF( x ) x
#undef FT_EXPORT_DEF #undef FT_EXPORT_DEF
#define FT_EXPORT_DEF( x ) x #define FT_EXPORT_DEF( x ) x

13
builds/amiga/makefile
View File

@ -5,7 +5,7 @@
# #
# Copyright 2005, 2006 by # Copyright 2005, 2006, 2007 by
# Werner Lemberg and Detlef Würkner. # Werner Lemberg and Detlef Würkner.
# #
# This file is part of the FreeType project, and may only be used, modified, # 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 ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
ftgasp.ppc.o: $(FTSRC)/base/ftgasp.c
$(CC) -c $(CFLAGS) -o $@ $<
ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
ftgxval.ppc.o: $(FTSRC)/base/ftgxval.c ftgxval.ppc.o: $(FTSRC)/base/ftgxval.c
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
ftlcdfil.ppc.o: $(FTSRC)/base/ftlcdfil.c
$(CC) -c $(CFLAGS) -o $@ $<
ftmm.ppc.o: $(FTSRC)/base/ftmm.c ftmm.ppc.o: $(FTSRC)/base/ftmm.c
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
@ -249,8 +255,9 @@ gxvalid.ppc.o: $(FTSRC)/gxvalid/gxvalid.c
otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftglyph.ppc.o \ BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o \
ftgxvalid.ppc.o ftmm.ppc.o ftotval.ppc.o ftpfr.ppc.o ftstroke.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 ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o ftxf86.ppc.o
DEBUGPPC = ftdebug.ppc.o ftdebugpure.ppc.o DEBUGPPC = ftdebug.ppc.o ftdebugpure.ppc.o

23
builds/amiga/makefile.os4
View File

@ -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 # AmigaOS4 SDK
# #
# Copyright 2005, 2006 by # Copyright 2005, 2006, 2007 by
# Werner Lemberg and Detlef Würkner. # Werner Lemberg and Detlef Würkner.
# #
# This file is part of the FreeType project, and may only be used, modified, # 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 # to build from the builds/amiga directory call
# #
# make # make -f makefile.os4
# #
# Your programs source code should start with this # Your programs source code should start with this
# (uncomment the parts you do not need to keep the program small): # (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 DIRFLAGS = -Iinclude -I/FT/src -I/FT/include -I/SDK/include
WARNINGS = -Wall -W -Wundef -Wpointer-arith -Wbad-function-cast \ WARNINGS = -Wall -W -Wundef -Wpointer-arith -Wbad-function-cast \
-Waggregate-return -Wshadow -Waggregate-return -Wwrite-strings -Wshadow
CPU = -mcpu=604e
OPTIONS = -DFT2_BUILD_LIBRARY -DNDEBUG -fno-builtin OPTIONS = -DFT2_BUILD_LIBRARY -DNDEBUG -fno-builtin
OPTIMIZE = -O2 -fomit-frame-pointer -fstrength-reduce -finline-functions 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 # FreeType2 library base
@ -98,12 +96,18 @@ ftdebug.ppc.o: FT:src/base/ftdebug.c
ftdebugpure.ppc.o: src/base/ftdebug.c ftdebugpure.ppc.o: src/base/ftdebug.c
$(CC) -c $(CFLAGS) -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 ftglyph.ppc.o: FT:src/base/ftglyph.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftglyph.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftglyph.c
ftgxval.ppc.o: FT:src/base/ftgxval.c ftgxval.ppc.o: FT:src/base/ftgxval.c
$(CC) -c $(CFLAGS) -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 ftmm.ppc.o: FT:src/base/ftmm.c
$(CC) -c $(CFLAGS) -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 otvalid.ppc.o: FT:src/otvalid/otvalid.c
$(CC) -c $(CFLAGS) -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 \ BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o \
ftgxval.ppc.o ftmm.ppc.o ftotval.ppc.o ftpfr.ppc.o ftstroke.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 ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o ftxf86.ppc.o
DEBUG = ftdebug.ppc.o ftdebugpure.ppc.o DEBUG = ftdebug.ppc.o ftdebugpure.ppc.o

11
builds/amiga/smakefile
View File

@ -3,7 +3,7 @@
# #
# Copyright 2005,2006 by # Copyright 2005,2006, 2007 by
# Werner Lemberg and Detlef Würkner. # Werner Lemberg and Detlef Würkner.
# #
# This file is part of the FreeType project, and may only be used, modified, # 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 # (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). # 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 \ OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftgasp.o ftglyph.o \
ftotval.o ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o ftxf86.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 OBJSYSTEM = ftsystem.o ftsystempure.o
@ -130,10 +131,14 @@ ftbdf.o: $(CORE)base/ftbdf.c
sc $(SCFLAGS) objname=$@ $< sc $(SCFLAGS) objname=$@ $<
ftbitmap.o: $(CORE)base/ftbitmap.c ftbitmap.o: $(CORE)base/ftbitmap.c
sc $(SCFLAGS) objname=$@ $< sc $(SCFLAGS) objname=$@ $<
ftgasp.o: $(CORE)base/ftgasp.c
sc $(SCFLAGS) objname=$@ $<
ftglyph.o: $(CORE)base/ftglyph.c ftglyph.o: $(CORE)base/ftglyph.c
sc $(SCFLAGS) objname=$@ $< sc $(SCFLAGS) objname=$@ $<
ftgxval.o: $(CORE)base/ftgxval.c ftgxval.o: $(CORE)base/ftgxval.c
sc $(SCFLAGS) objname=$@ $< sc $(SCFLAGS) objname=$@ $<
ftlcdfil.o: $(CORE)base/ftlcdfil.c
sc $(SCFLAGS) objname=$@ $<
ftmm.o: $(CORE)base/ftmm.c ftmm.o: $(CORE)base/ftmm.c
sc $(SCFLAGS) objname=$@ $< sc $(SCFLAGS) objname=$@ $<
ftotval.o: $(CORE)base/ftotval.c ftotval.o: $(CORE)base/ftotval.c