fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2026-05-02 07:28:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
freetype/src/gzip
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
..
adler32.c Remove tabs from source files. 2007-06-01 06:56:17 +00:00
ftgzip.c [gzip] Improve building with external zlib (#49673). 2016-12-01 11:36:37 +01:00
ftzconf.h [gzip] Improve building with external zlib (#49673). 2016-12-01 11:36:37 +01:00
infblock.c * include/freetype/internal/bdftypes.h: removed obsolete header 2003-10-29 21:43:52 +00:00
infblock.h 2002-11-05 David Turner <david@freetype.org> 2002-11-06 22:32:54 +00:00
infcodes.c various improvements for 2.1.4. see ChangeLog, I've got problems with 2003-01-30 23:24:18 +00:00
infcodes.h 2002-11-05 David Turner <david@freetype.org> 2002-11-06 22:32:54 +00:00
inffixed.h * src/autohint/ahglobal.c (blue_chars), src/winfonts/winfnt.c 2003-10-15 22:20:56 +00:00
inflate.c various improvements for 2.1.4. see ChangeLog, I've got problems with 2003-01-30 23:24:18 +00:00
inftrees.c Don't use `register' keyword. Fixes compiler warnings. 2014-08-31 08:47:11 +02:00
inftrees.h * src/autohint/ahglobal.c (blue_chars), src/winfonts/winfnt.c 2003-10-15 22:20:56 +00:00
infutil.c * src/autohint/ahglobal.c (blue_chars), src/winfonts/winfnt.c 2003-10-15 22:20:56 +00:00
infutil.h * src/gzip/ftgzip.c: (inflate_mask): Replaced with... 2003-06-09 20:55:04 +00:00
Jamfile Update copyright year. 2016-01-13 11:54:10 +01:00
rules.mk [gzip] Improve building with external zlib (#49673). 2016-12-01 11:36:37 +01:00
zlib.h [gzip] Improve building with external zlib (#49673). 2016-12-01 11:36:37 +01:00
zutil.c gzip: Use FT2 zcalloc() & zfree() in ftgzip.c by default. 2009-08-01 00:30:11 +09:00
zutil.h Remove tabs from source files. 2007-06-01 06:56:17 +00:00