Update Amiga makefiles to include Bzip2 support.
Currently, it provides FT_Stream_OpenBzip2() that returns unimplemented error always, to prevent unresolved symbol error for the applications designed for Unix systems. * builds/amiga/makefile: Include bzip2.ppc.o built from ftbzip2.c. * builds/amiga/makefile.os4: Include bzip2.o built from ftbzip2.c. * builds/amiga/smakefile: Ditto.
This commit is contained in:
parent
41d7e4a6ed
commit
be683e7597
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
Update Amiga makefiles to include Bzip2 support.
|
||||||
|
|
||||||
|
Currently, it provides FT_Stream_OpenBzip2() that returns
|
||||||
|
unimplemented error always, to prevent unresolved symbol
|
||||||
|
error for the applications designed for Unix systems.
|
||||||
|
|
||||||
|
* builds/amiga/makefile: Include bzip2.ppc.o built from ftbzip2.c.
|
||||||
|
* builds/amiga/makefile.os4: Include bzip2.o built from ftbzip2.c.
|
||||||
|
* builds/amiga/smakefile: Ditto.
|
||||||
|
|
||||||
2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
Update pkg-config tools to reflect Bzip2 support.
|
Update pkg-config tools to reflect Bzip2 support.
|
||||||
|
|
|
@ -234,6 +234,11 @@ pcf.ppc.o: $(FTSRC)/pcf/pcf.c
|
||||||
gzip.ppc.o: $(FTSRC)/gzip/ftgzip.c
|
gzip.ppc.o: $(FTSRC)/gzip/ftgzip.c
|
||||||
$(CC) -c $(CFLAGS) -o $@ $<
|
$(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
|
# FreeType2 library bzip2 support for compressed PCF bitmap fonts
|
||||||
|
#
|
||||||
|
bzip2.ppc.o: $(FTSRC)/bzip2/ftbzip2.c
|
||||||
|
$(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
#
|
#
|
||||||
# FreeType2 library compress support for compressed PCF bitmap fonts
|
# FreeType2 library compress support for compressed PCF bitmap fonts
|
||||||
#
|
#
|
||||||
|
@ -285,8 +290,8 @@ RASTERPPC = raster.ppc.o smooth.ppc.o
|
||||||
FONTDPPC = cff.ppc.o type1.ppc.o type42.ppc.o type1cid.ppc.o truetype.ppc.o\
|
FONTDPPC = cff.ppc.o type1.ppc.o type42.ppc.o type1cid.ppc.o truetype.ppc.o\
|
||||||
bdf.ppc.o pcf.ppc.o pfr.ppc.o winfnt.ppc.o
|
bdf.ppc.o pcf.ppc.o pfr.ppc.o winfnt.ppc.o
|
||||||
|
|
||||||
libft2_ppc.a: $(BASEPPC) $(AFITPPC) $(GXVPPC) $(OTVPPC) $(PSPPC) $(RASTERPPC) sfnt.ppc.o ftcache.ppc.o $(FONTDPPC) gzip.ppc.o lzw.ppc.o
|
libft2_ppc.a: $(BASEPPC) $(AFITPPC) $(GXVPPC) $(OTVPPC) $(PSPPC) $(RASTERPPC) sfnt.ppc.o ftcache.ppc.o $(FONTDPPC) gzip.ppc.o bzip2.ppc.o lzw.ppc.o
|
||||||
$(AR) $@ $(BASEPPC) $(AFITPPC) $(GXVPPC) $(OTVPPC) $(PSPPC) $(RASTERPPC) sfnt.ppc.o ftcache.ppc.o $(FONTDPPC) gzip.ppc.o lzw.ppc.o
|
$(AR) $@ $(BASEPPC) $(AFITPPC) $(GXVPPC) $(OTVPPC) $(PSPPC) $(RASTERPPC) sfnt.ppc.o ftcache.ppc.o $(FONTDPPC) gzip.ppc.o bzip2.ppc.o lzw.ppc.o
|
||||||
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
|
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
|
||||||
|
|
||||||
#Local Variables:
|
#Local Variables:
|
||||||
|
|
|
@ -237,6 +237,12 @@ pcf.ppc.o: FT:src/pcf/pcf.c
|
||||||
gzip.ppc.o: FT:src/gzip/ftgzip.c
|
gzip.ppc.o: FT:src/gzip/ftgzip.c
|
||||||
$(CC) -c $(CFLAGS) -o $@ /FT/src/gzip/ftgzip.c
|
$(CC) -c $(CFLAGS) -o $@ /FT/src/gzip/ftgzip.c
|
||||||
|
|
||||||
|
#
|
||||||
|
# FreeType2 library bzip2 support for compressed PCF bitmap fonts
|
||||||
|
#
|
||||||
|
bzip2.ppc.o: FT:src/bzip2/ftbzip2.c
|
||||||
|
$(CC) -c $(CFLAGS) -o $@ /FT/src/bzip2/ftbzip2.c
|
||||||
|
|
||||||
#
|
#
|
||||||
# FreeType2 library compress support for compressed PCF bitmap fonts
|
# FreeType2 library compress support for compressed PCF bitmap fonts
|
||||||
#
|
#
|
||||||
|
|
|
@ -98,8 +98,8 @@ assign:
|
||||||
|
|
||||||
# uses separate object modules in lib to make for easier debugging
|
# uses separate object modules in lib to make for easier debugging
|
||||||
# also, can make smaller programs if entire engine is not used
|
# also, can make smaller programs if entire engine is not used
|
||||||
ft2_$(CPU).lib: $(OBJBASE) $(OBJAFIT) $(OBJOTV) $(OBJPS) $(OBJRASTER) $(OBJSFNT) $(OBJCACHE) $(OBJFONTD) lzw.o gzip.o
|
ft2_$(CPU).lib: $(OBJBASE) $(OBJAFIT) $(OBJOTV) $(OBJPS) $(OBJRASTER) $(OBJSFNT) $(OBJCACHE) $(OBJFONTD) lzw.o gzip.o bzip2.o
|
||||||
oml $@ r $(OBJBASE) $(OBJAFIT) $(OBJOTV) $(OBJPS) $(OBJRASTER) $(OBJSFNT) $(OBJCACHE) $(OBJFONTD) lzw.o gzip.o
|
oml $@ r $(OBJBASE) $(OBJAFIT) $(OBJOTV) $(OBJPS) $(OBJRASTER) $(OBJSFNT) $(OBJCACHE) $(OBJFONTD) lzw.o gzip.o bzip2.o
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-delete \#?.o
|
-delete \#?.o
|
||||||
|
@ -262,6 +262,12 @@ pcf.o: $(CORE)pcf/pcf.c
|
||||||
gzip.o: $(CORE)gzip/ftgzip.c
|
gzip.o: $(CORE)gzip/ftgzip.c
|
||||||
sc $(SCFLAGS) define FAR objname=$@ $<
|
sc $(SCFLAGS) define FAR objname=$@ $<
|
||||||
|
|
||||||
|
#
|
||||||
|
# freetype library bzip2 support for compressed PCF bitmap fonts
|
||||||
|
#
|
||||||
|
bzip2.o: $(CORE)bzip2/ftbzip2.c
|
||||||
|
sc $(SCFLAGS) define FAR objname=$@ $<
|
||||||
|
|
||||||
#
|
#
|
||||||
# freetype library compress support for compressed PCF bitmap fonts
|
# freetype library compress support for compressed PCF bitmap fonts
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue