fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2026-05-23 08:38:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
freetype/src
History
Werner Lemberg 602be7c810 [gzip] Improve building with external zlib (#49673). 
Building FreeType with external zlib 1.2.8 makes msvc 14 stop with
the following error.

  ftgzip.c
  zlib-1.2.8\zlib.h(86): error C2061:
                         syntax error: identifier 'z_const'
  zlib-1.2.8\zlib.h(94): error C2054:
                         expected '(' to follow 'z_const'
  zlib-1.2.8\zlib.h(94): error C2085:
                         'msg': not in formal parameter list
  ...
  zlib-1.2.8\zlib.h(877): fatal error C1003:
                          error count exceeds 100; stopping compilation

The error happens because FreeType keeps an own copy of zlib-1.1.4
under `src/gzip'.  When building `src/gzip/ftgzip.c' with
FT_CONFIG_OPTION_SYSTEM_ZLIB defined, it uses

  #include <zlib.h>

which correctly finds an external `zlib.h', but `zlib.h' itself has
a line

  #include "zconf.h"

which makes Visual Studio 2015 find `src/gzip/zconf.h' while
compiling the files in `src/gzip'.

* src/gzip/zconf.h: Rename to...
* src/gzip/ftzconf.h: ... this.
* src/gzip/zlib.h, src/gzip/rules.mk (GZIP_DRV_SRCS): Updated.
2016-12-01 11:36:37 +01:00
..
autofit [autofit] Fix Emscripten crash (patch #9180). 2016-12-01 07:07:22 +01:00
base * src/base/ftobjs.c (FT_Render_Glyph_Internal): Fix tracing. 2016-11-06 12:39:05 +01:00
bdf */*: s/FT_MEM_ZERO/FT_ZERO/ where appropriate. 2016-09-28 19:06:21 +02:00
bzip2 Update copyright year. 2016-01-13 11:54:10 +01:00
cache s/0/NULL/ for function pointers; comments, formatting. 2016-09-17 17:12:50 +02:00
cff [cff] Correct cmap format reporting (#24819). 2016-10-25 22:31:42 -04:00
cid * src/cid/cidload.c (cid_face_open): Properly propagate `error'. 2016-10-08 20:26:59 +02:00
gxvalid More FT_ZERO usage. 2016-09-28 19:10:52 +02:00
gzip [gzip] Improve building with external zlib (#49673). 2016-12-01 11:36:37 +01:00
lzw [lzw] Optimize last commit. 2016-08-16 13:44:38 +02:00
otvalid s/0/NULL/ for function pointers; comments, formatting. 2016-09-17 17:12:50 +02:00
pcf Introduce a way of quickly retrieving (embedded) bitmap metrics. 2016-11-06 12:32:51 +01:00
pfr Introduce a way of quickly retrieving (embedded) bitmap metrics. 2016-11-06 12:32:51 +01:00
psaux [psaux] Fix handling of invalid flex subrs. 2016-10-11 08:57:55 +02:00
pshinter */*: s/FT_MEM_ZERO/FT_ZERO/ where appropriate. 2016-09-28 19:06:21 +02:00
psnames s/0/NULL/ for function pointers; comments, formatting. 2016-09-17 17:12:50 +02:00
raster More FT_ZERO usage. 2016-09-28 19:10:52 +02:00
sfnt [sfnt] Improve FT_LOAD_BITMAP_METRICS_ONLY for `sbix' format. 2016-11-06 12:37:55 +01:00
smooth [smooth] Revert previous commit. Already fixed with 6ca54c64. 2016-11-29 18:45:22 +01:00
tools URL updates. 2016-10-13 22:52:40 -04:00
truetype [truetype] Clamp variation requests to valid range. 2016-11-03 06:41:00 +01:00
type1 Add `FT_Get_{MM,Var}_Blend_Coordinates' functions. 2016-10-26 16:00:00 +02:00
type42 */*: s/FT_MEM_ZERO/FT_ZERO/ where appropriate. 2016-09-28 19:06:21 +02:00
winfonts Introduce a way of quickly retrieving (embedded) bitmap metrics. 2016-11-06 12:32:51 +01:00
Jamfile Update copyright year. 2016-01-13 11:54:10 +01:00