* include/freetype/internal/ftstream.h: fixed the definitions of

GET_LongLE and GET_ULongLE which where incorrect (creating problems
        in the pcf driver)..

        * INSTALL: updated the instructions to build shared libraries with
        Jam.. they were simply erroneous..
This commit is contained in:
David Turner 2001-12-11 13:14:41 +00:00
parent 640078d425
commit 7da4824dfb
3 changed files with 37 additions and 28 deletions

View File

@ -1,3 +1,12 @@
2001-12-11 Detlef Würkner (TetiSoft@apg.lahn.de)
* include/freetype/internal/ftstream.h: fixed the definitions of
GET_LongLE and GET_ULongLE which where incorrect (creating problems
in the pcf driver)..
* INSTALL: updated the instructions to build shared libraries with
Jam.. they were simply erroneous..
2001-12-10 Francesco Zappa Nardelli <Francesco.Zappa.Nardelli@ens.fr> 2001-12-10 Francesco Zappa Nardelli <Francesco.Zappa.Nardelli@ens.fr>
* src/pcf/pcfdriver.c (PCF_Init_Face): allow Xft to use PCF fonts * src/pcf/pcfdriver.c (PCF_Init_Face): allow Xft to use PCF fonts

52
INSTALL
View File

@ -7,45 +7,45 @@ I. From the command line
There are two ways to quickly build FreeType 2 from the command There are two ways to quickly build FreeType 2 from the command
line. line.
The first, and favorite one, is to use the "Jam" build tool. Jam is The first, and favorite one, is to use the "Jam" build tool. Jam is
a highly portable replacement for Make whose control files do not a highly portable replacement for Make whose control files do not
depend on the current platform or compiler toolset. depend on the current platform or compiler toolset.
For more information, please see: For more information, please see:
http://www.freetype.org/jam/index.html http://www.freetype.org/jam/index.html
The second one is to use "GNU Make" (and NO OTHER MAKE TOOL). The second one is to use "GNU Make" (and NO OTHER MAKE TOOL).
1. Building FT2 with "Jam" 1. Building FT2 with "Jam"
-------------------------- --------------------------
Once you've got *our version* of the Jam tool installed on your Once you've got *our version* of the Jam tool installed on your
system, simply go to the top-level FT2 directory, then type system, simply go to the top-level FT2 directory, then type
"jam" "jam"
on the command line. This will build the library and place it in on the command line. This will build the library and place it in
the "objs" directory. the "objs" directory.
By default, a static library is built. On Unix systems, it is By default, a static library is built. On Unix systems, it is
possible to build a shared library through the "libtool" script. possible to build a shared library through the "libtool" script.
You need to have libtool installed on your system, then re-define You need to have libtool installed on your system, then re-define
a few environment variables before invoking Jam, as in a few environment variables before invoking Jam, as in
export CC="libtool --mode=compile" export CC="libtool --mode=compile cc"
export LINK="libtool --mode=link" export LINK="libtool --mode=link cc"
jam jam
In later releases of FT2, building shared libraries with Jam In later releases of FT2, building shared libraries with Jam
should become automatic. should become automatic.
2. Building FT2 with "GNU Make" 2. Building FT2 with "GNU Make"
------------------------------- -------------------------------
You need to have GNU Make (version 3.78.1 or newer) installed on You need to have GNU Make (version 3.78.1 or newer) installed on
your system to compile the library from the command line. This will your system to compile the library from the command line. This will
_NOT_ work with other make tools (including BSD make)! _NOT_ work with other make tools (including BSD make)!
@ -54,7 +54,7 @@ I. From the command line
of make called `makepp' has appeared which can also build FreeType 2 of make called `makepp' has appeared which can also build FreeType 2
successfully on Unix platforms. See http://LNC.usc.edu/~holt/makepp successfully on Unix platforms. See http://LNC.usc.edu/~holt/makepp
for more details.] for more details.]
- Go to the `freetype2' directory. - Go to the `freetype2' directory.
- Unix (any C compiler should work): - Unix (any C compiler should work):
@ -82,39 +82,39 @@ I. From the command line
See http://www.freetype.org/download.html for details. See http://www.freetype.org/download.html for details.
- gcc (Mingw, _not_ CygWin): - gcc (Mingw, _not_ CygWin):
- make setup - make setup
- make - make
- Visual C++: - Visual C++:
- make setup visualc - make setup visualc
- make - make
- other compilers: - other compilers:
- make setup bcc32 -> Borland C++ 32 bits - make setup bcc32 -> Borland C++ 32 bits
- make setup intelc -> Intel C++ - make setup intelc -> Intel C++
- make setup watcom -> Watcom C++ - make setup watcom -> Watcom C++
- make setup lcc -> Win32-LCC - make setup lcc -> Win32-LCC
II. In your own environment (IDE) II. In your own environment (IDE)
--------------------------------- ---------------------------------
You need to add the directories "freetype2/include" to your include You need to add the directories "freetype2/include" to your include
path when compiling the library. path when compiling the library.
FreeType 2 is made of several components; each one of them is FreeType 2 is made of several components; each one of them is
located in a subdirectory of "freetype2/src". For example, located in a subdirectory of "freetype2/src". For example,
`freetype2/src/truetype/' contains the TrueType font driver. `freetype2/src/truetype/' contains the TrueType font driver.
DO NOT COMPILE ALL C FILES! Rather, compile the following ones: DO NOT COMPILE ALL C FILES! Rather, compile the following ones:
-- base components (required) -- base components (required)
src/base/ftsystem.c src/base/ftsystem.c
src/base/ftinit.c src/base/ftinit.c
src/base/ftdebug.c src/base/ftdebug.c
@ -122,7 +122,7 @@ II. In your own environment (IDE)
src/base/ftglyph.c src/base/ftglyph.c
src/base/ftbbox.c src/base/ftbbox.c
src/base/ftmm.c src/base/ftmm.c
src/base/ftmac.c -- only on the Macintosh src/base/ftmac.c -- only on the Macintosh
-- other components are optional -- other components are optional
@ -140,7 +140,7 @@ II. In your own environment (IDE)
src/winfonts/winfonts.c -- Windows FONT / FNT font driver src/winfonts/winfonts.c -- Windows FONT / FNT font driver
Note: Note:
`truetype.c' needs `sfnt.c' and `psnames.c' `truetype.c' needs `sfnt.c' and `psnames.c'
`type1.c' needs `psaux.c' and `psnames.c' `type1.c' needs `psaux.c' and `psnames.c'
`type1cid.c' needs `psaux.c' and `psnames.c' `type1cid.c' needs `psaux.c' and `psnames.c'

View File

@ -268,8 +268,8 @@ FT_BEGIN_HEADER
#define GET_ShortLE() FT_GET_MACRO( FT_Get_ShortLE, FT_Short ) #define GET_ShortLE() FT_GET_MACRO( FT_Get_ShortLE, FT_Short )
#define GET_UShortLE() FT_GET_MACRO( FT_Get_ShortLE, FT_UShort ) #define GET_UShortLE() FT_GET_MACRO( FT_Get_ShortLE, FT_UShort )
#define GET_LongLE() FT_GET_MACRO( FT_Get_LongLE, FT_Short ) #define GET_LongLE() FT_GET_MACRO( FT_Get_LongLE, FT_Long )
#define GET_ULongLE() FT_GET_MACRO( FT_Get_LongLE, FT_Short ) #define GET_ULongLE() FT_GET_MACRO( FT_Get_LongLE, FT_ULong )
#define FT_READ_MACRO( func, type, var ) \ #define FT_READ_MACRO( func, type, var ) \
( var = (type)func( stream, &error ), \ ( var = (type)func( stream, &error ), \