From 7d04322e40ccba6a3483ec7ba934629db33388f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Detlef=20W=C3=BCrkner?= <tetisoft@apg.lahn.de> Date: Wed, 5 Apr 2006 07:17:12 +0000 Subject: [PATCH] no message --- ChangeLog | 5 +++++ builds/amiga/makefile | 4 ++-- builds/amiga/makefile.os4 | 4 ++-- builds/amiga/smakefile | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53049bcd7..b4e575dd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-05 Detlef W�rkner <TetiSoft@apg.lahn.de> + + * builds/amiga/makefile, builds/amiga/makefile.os4, + builds/amiga/smakefile: Added FT2_BUILD_LIBRARY define. + 2006-04-03 luoyi <luoyi.ly@gmail.com> * builds/compiler/intelc.mk (TE): New variable. diff --git a/builds/amiga/makefile b/builds/amiga/makefile index 811c828c0..fcc1efac7 100644 --- a/builds/amiga/makefile +++ b/builds/amiga/makefile @@ -5,7 +5,7 @@ # -# Copyright 2005 by +# Copyright 2005, 2006 by # Werner Lemberg and Detlef W�rkner. # # This file is part of the FreeType project, and may only be used, modified, @@ -56,7 +56,7 @@ CC = ppc-morphos-gcc AR = ppc-morphos-ar rc RANLIB = ppc-morphos-ranlib LD = ppc-morphos-ld -CFLAGS = -O2 -I/emu/emulinclude/includegcc -I/emu/include -Iinclude -I$(FTSRC) -I/FT/include +CFLAGS = -DFT2_BUILD_LIBRARY -O2 -I/emu/emulinclude/includegcc -I/emu/include -Iinclude -I$(FTSRC) -I/FT/include # # FreeType2 library base diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4 index 773067b74..407436bba 100644 --- a/builds/amiga/makefile.os4 +++ b/builds/amiga/makefile.os4 @@ -4,7 +4,7 @@ # -# Copyright 2005 by +# Copyright 2005, 2006 by # Werner Lemberg and Detlef W�rkner. # # This file is part of the FreeType project, and may only be used, modified, @@ -58,7 +58,7 @@ WARNINGS = -Wall -W -Wundef -Wpointer-arith -Wbad-function-cast \ CPU = -mcpu=604e -OPTIONS = -DNDEBUG -fno-builtin +OPTIONS = -DFT2_BUILD_LIBRARY -DNDEBUG -fno-builtin OPTIMIZE = -O2 -fomit-frame-pointer -fstrength-reduce -finline-functions CFLAGS = $(DIRFLAGS) $(WARNINGS) $(FT2FLAGS) $(CPU) $(OPTIONS) $(OPTIMIZE) diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile index 5a9a2733d..bc67cf4db 100644 --- a/builds/amiga/smakefile +++ b/builds/amiga/smakefile @@ -3,7 +3,7 @@ # -# Copyright 2005 by +# Copyright 2005,2006 by # Werner Lemberg and Detlef W�rkner. # # This file is part of the FreeType project, and may only be used, modified, @@ -78,7 +78,7 @@ OPTIMIZER = optinlocal SCFLAGS = optimize opttime optsched strmerge data=faronly idlen=50 cpu=$(CPU)\ idir=include/ idir=$(CORE) idir=FT:include/ nostackcheck nochkabort\ - noicons ignore=79,85,110,306 parameters=both + noicons ignore=79,85,110,306 parameters=both define=FT2_BUILD_LIBRARY LIB = ft2_$(CPU).lib