From 0e1cccead20adde3dffb42b0c94e0bf787d14b1f Mon Sep 17 00:00:00 2001
From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 11 Sep 2020 16:25:56 +0300
Subject: [PATCH] =?utf8?q?Add=20support=20for=20ZLIB=5FCOMP=C3=85T=20in=20?=
 =?utf8?q?nmake=20Makefiles=20for=20ARM/AArch64.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 win32/Makefile.a64 | 13 ++++++++++---
 win32/Makefile.arm | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index fd34b409..e8a5a7b4 100644
--- 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 910fdcde..848fd62c 100644
--- 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
-- 
2.47.2