Commit 7da4824dfb05ab88413b9cb52dff515283f32e52
2001-12-11T13:14:41
* 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..
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
diff --git a/ChangeLog b/ChangeLog
index a50e73d..8856fad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* src/pcf/pcfdriver.c (PCF_Init_Face): allow Xft to use PCF fonts
diff --git a/INSTALL b/INSTALL
index 6bff2f9..446c8c9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,45 +7,45 @@ I. From the command line
There are two ways to quickly build FreeType 2 from the command
line.
-
+
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
depend on the current platform or compiler toolset.
-
+
For more information, please see:
http://www.freetype.org/jam/index.html
-
+
The second one is to use "GNU Make" (and NO OTHER MAKE TOOL).
-
-
+
+
1. Building FT2 with "Jam"
--------------------------
-
+
Once you've got *our version* of the Jam tool installed on your
system, simply go to the top-level FT2 directory, then type
-
+
"jam"
-
+
on the command line. This will build the library and place it in
the "objs" directory.
-
+
By default, a static library is built. On Unix systems, it is
possible to build a shared library through the "libtool" script.
You need to have libtool installed on your system, then re-define
a few environment variables before invoking Jam, as in
- export CC="libtool --mode=compile"
- export LINK="libtool --mode=link"
+ export CC="libtool --mode=compile cc"
+ export LINK="libtool --mode=link cc"
jam
-
+
In later releases of FT2, building shared libraries with Jam
should become automatic.
-
-
+
+
2. Building FT2 with "GNU Make"
-------------------------------
-
+
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
_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
successfully on Unix platforms. See http://LNC.usc.edu/~holt/makepp
for more details.]
-
+
- Go to the `freetype2' directory.
- Unix (any C compiler should work):
@@ -82,39 +82,39 @@ I. From the command line
See http://www.freetype.org/download.html for details.
- gcc (Mingw, _not_ CygWin):
-
+
- make setup
- make
- Visual C++:
-
+
- make setup visualc
- make
- other compilers:
-
+
- make setup bcc32 -> Borland C++ 32 bits
- make setup intelc -> Intel C++
- make setup watcom -> Watcom C++
- make setup lcc -> Win32-LCC
-
+
II. In your own environment (IDE)
---------------------------------
You need to add the directories "freetype2/include" to your include
path when compiling the library.
-
+
FreeType 2 is made of several components; each one of them is
located in a subdirectory of "freetype2/src". For example,
`freetype2/src/truetype/' contains the TrueType font driver.
-
+
DO NOT COMPILE ALL C FILES! Rather, compile the following ones:
-
+
-- base components (required)
-
+
src/base/ftsystem.c
src/base/ftinit.c
src/base/ftdebug.c
@@ -122,7 +122,7 @@ II. In your own environment (IDE)
src/base/ftglyph.c
src/base/ftbbox.c
src/base/ftmm.c
-
+
src/base/ftmac.c -- only on the Macintosh
-- other components are optional
@@ -140,7 +140,7 @@ II. In your own environment (IDE)
src/winfonts/winfonts.c -- Windows FONT / FNT font driver
Note:
-
+
`truetype.c' needs `sfnt.c' and `psnames.c'
`type1.c' needs `psaux.c' and `psnames.c'
`type1cid.c' needs `psaux.c' and `psnames.c'
diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h
index df9c4e3..eee8bd9 100644
--- a/include/freetype/internal/ftstream.h
+++ b/include/freetype/internal/ftstream.h
@@ -268,8 +268,8 @@ FT_BEGIN_HEADER
#define GET_ShortLE() FT_GET_MACRO( FT_Get_ShortLE, FT_Short )
#define GET_UShortLE() FT_GET_MACRO( FT_Get_ShortLE, FT_UShort )
-#define GET_LongLE() FT_GET_MACRO( FT_Get_LongLE, FT_Short )
-#define GET_ULongLE() 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_ULong )
#define FT_READ_MACRO( func, type, var ) \
( var = (type)func( stream, &error ), \