diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-12-01 11:36:37 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-12-01 11:36:37 +0100 |
| commit | 602be7c810634f6d565b45f719e429ec5144dfd3 (patch) | |
| tree | 7af04e17f193caa47061873f1b8f7043c19d94ba /src/gzip/rules.mk | |
| parent | 255828c8912c580f9ee30a92a757e3b967bc168d (diff) | |
| download | freetype2-602be7c810634f6d565b45f719e429ec5144dfd3.tar.gz | |
[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.
Diffstat (limited to 'src/gzip/rules.mk')
| -rw-r--r-- | src/gzip/rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gzip/rules.mk b/src/gzip/rules.mk index b0c9056bb..16af8c02d 100644 --- a/src/gzip/rules.mk +++ b/src/gzip/rules.mk @@ -40,6 +40,7 @@ endif # unconditionally. # GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c \ + $(GZIP_DIR)/ftzconf.h \ $(GZIP_DIR)/infblock.c \ $(GZIP_DIR)/infblock.h \ $(GZIP_DIR)/infcodes.c \ @@ -50,7 +51,6 @@ GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c \ $(GZIP_DIR)/inftrees.h \ $(GZIP_DIR)/infutil.c \ $(GZIP_DIR)/infutil.h \ - $(GZIP_DIR)/zconf.h \ $(GZIP_DIR)/zlib.h \ $(GZIP_DIR)/zutil.c \ $(GZIP_DIR)/zutil.h |