Add support for ZLIB_COMPÅT in nmake Makefiles for ARM/AArch64.

diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index fd34b409a7aaedfc8882cbcaf72c0513bf7a5325..e8a5a7b441547752fc2125c6d645509557ffbaf3 100644 (file)
--- a/win32/Makefile.a64
+++ b/win32/Makefile.a64
@@ -38,6 +38,7 @@ DEFFILE = zlib.def
 RCFILE = zlib1.rc
 RESFILE = zlib1.res
 WITH_GZFILEOP =
+ZLIB_COMPAT =
 SUFFIX =
 
 OBJS = \
@@ -62,9 +63,9 @@ OBJS = \
        uncompr.obj \
        zutil.obj \
        #
-!if "$(WITH_GZFILEOP)" != ""
-WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
-OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
+!if "$(ZLIB_COMPAT)" != ""
+WITH_GZFILEOP = yes
+WFLAGS = $(WFLAGS) -DZLIB_COMPAT
 DEFFILE = zlibcompat.def
 !else
 STATICLIB = zlib-ng.lib
@@ -75,6 +76,12 @@ RCFILE = zlib-ng1.rc
 RESFILE = zlib-ng1.res
 SUFFIX = -ng
 !endif
+
+!if "$(WITH_GZFILEOP)" != ""
+WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
+OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
+!endif
+
 WFLAGS = $(WFLAGS) \
        -DARM_ACLE_CRC_HASH \
        -D__ARM_NEON__=1 \

diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index 910fdcde199c31bda480b0b15e101edb1e94bad0..848fd62cd1e4918a27edaf71ffe8850795c6c4d2 100644 (file)
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -37,6 +37,7 @@ DEFFILE = zlib.def
 RCFILE = zlib1.rc
 RESFILE = zlib1.res
 WITH_GZFILEOP =
+ZLIB_COMPAT =
 WITH_ACLE =
 WITH_NEON =
 WITH_VFPV3 =
@@ -65,9 +66,9 @@ OBJS = \
        uncompr.obj \
        zutil.obj \
        #
-!if "$(WITH_GZFILEOP)" != ""
-WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
-OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
+!if "$(ZLIB_COMPAT)" != ""
+WITH_GZFILEOP = yes
+WFLAGS = $(WFLAGS) -DZLIB_COMPAT
 DEFFILE = zlibcompat.def
 !else
 STATICLIB = zlib-ng.lib
@@ -78,6 +79,12 @@ RCFILE = zlib-ng1.rc
 RESFILE = zlib-ng1.res
 SUFFIX = -ng
 !endif
+
+!if "$(WITH_GZFILEOP)" != ""
+WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
+OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
+!endif
+
 !if "$(WITH_ACLE)" != ""
 WFLAGS = $(WFLAGS) -DARM_ACLE_CRC_HASH
 OBJS = $(OBJS) crc32_acle.obj insert_string_acle.obj