diff options
| author | Mika Lindqvist <postmaster@raasu.org> | 2020-09-11 16:25:56 +0300 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2020-09-13 12:57:30 +0200 |
| commit | 0e1cccead20adde3dffb42b0c94e0bf787d14b1f (patch) | |
| tree | b6eec914cee10aa8d4ea57b2bb942bb57700ea2a /win32 | |
| parent | e58738845fc35943f054befbb0b36234b50e8f94 (diff) | |
Add support for ZLIB_COMPÅT in nmake Makefiles for ARM/AArch64.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.a64 | 13 | ||||
| -rw-r--r-- | win32/Makefile.arm | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/win32/Makefile.a64 b/win32/Makefile.a64 index fd34b40..e8a5a7b 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 910fdcd..848fd62 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 |