Separate defines on individual lines to prevent merge conflicts.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efa91a655a9328c270626ef63d5550708f3c6b5a..3b68134659c3fb7605c2f0866188c7532e0c68b2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,8 +104,18 @@ elseif(BASEARCH_X86_FOUND)
     option(WITH_PCLMULQDQ "Build with PCLMULQDQ" ON)
 endif()
 
-mark_as_advanced(FORCE ZLIB_DUAL_LINK WITH_ACLE WITH_NEON WITH_DFLTCC_DEFLATE WITH_DFLTCC_INFLATE
-    WITH_AVX2 WITH_SSE2 WITH_SSSE3 WITH_SSE4 WITH_PCLMULQDQ WITH_POWER8 WITH_INFLATE_STRICT WITH_INFLATE_ALLOW_INVALID_DIST)
+mark_as_advanced(FORCE
+    ZLIB_DUAL_LINK
+    WITH_ACLE WITH_NEON
+    WITH_DFLTCC_DEFLATE
+    WITH_DFLTCC_INFLATE
+    WITH_AVX2 WITH_SSE2
+    WITH_SSSE3 WITH_SSE4
+    WITH_PCLMULQDQ
+    WITH_POWER8
+    WITH_INFLATE_STRICT
+    WITH_INFLATE_ALLOW_INVALID_DIST
+    )
 
 add_feature_info(ZLIB_COMPAT ZLIB_COMPAT "Provide a zlib-compatible API")
 add_feature_info(WITH_GZFILEOP WITH_GZFILEOP "Compile with support for gzFile-related functions")

diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index aebfaafa40b97c2ecf0dc1a9632f82fd59f2948c..6b6a8f5b2865d35415d90cd0f4305f11bc0c68ee 100644 (file)
--- a/win32/Makefile.a64
+++ b/win32/Makefile.a64
@@ -23,7 +23,13 @@ AR = lib
 RC = rc
 CP = copy /y
 CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DUNALIGNED_OK -DUNALIGNED64_OK -D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+WFLAGS  = \
+       -D_CRT_SECURE_NO_DEPRECATE \
+       -D_CRT_NONSTDC_NO_DEPRECATE \
+       -DUNALIGNED_OK \
+       -DUNALIGNED64_OK \
+       -D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \
+       #
 LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
 ARFLAGS = -nologo
 RCFLAGS = /dARM64 /r
@@ -53,7 +59,7 @@ OBJS = \
        trees.obj \
        uncompr.obj \
        zutil.obj \
-
+       #
 !if "$(WITH_GZFILEOP)" != ""
 WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
 OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
@@ -67,7 +73,13 @@ RCFILE = zlib-ng1.rc
 RESFILE = zlib-ng1.res
 SUFFIX = -ng
 !endif
-WFLAGS = $(WFLAGS) -DARM_ACLE_CRC_HASH -D__ARM_NEON__=1 -DARM_NEON_ADLER32 -DARM_NEON_SLIDEHASH -DARM_NOCHECK_NEON
+WFLAGS = $(WFLAGS) \
+       -DARM_ACLE_CRC_HASH \
+       -D__ARM_NEON__=1 \
+       -DARM_NEON_ADLER32 \
+       -DARM_NEON_SLIDEHASH \
+       -DARM_NOCHECK_NEON \
+       #
 OBJS = $(OBJS) crc32_acle.obj insert_string_acle.obj slide_neon.obj adler32_neon.obj
 
 # targets

diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index 9c9d4ffb59ea4e501efad804b56b835bc48f144f..95933e247c7187573edc30936190a07a2b72e3c0 100644 (file)
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -23,7 +23,12 @@ AR = lib
 RC = rc
 CP = copy /y
 CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DUNALIGNED_OK -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+WFLAGS  = \
+       -D_CRT_SECURE_NO_DEPRECATE \
+       -D_CRT_NONSTDC_NO_DEPRECATE \
+       -DUNALIGNED_OK \
+       -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \
+       #
 LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
 ARFLAGS = -nologo
 RCFLAGS = /dARM /r
@@ -57,7 +62,7 @@ OBJS = \
        trees.obj \
        uncompr.obj \
        zutil.obj \
-
+       #
 !if "$(WITH_GZFILEOP)" != ""
 WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
 OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
@@ -80,7 +85,12 @@ NEON_ARCH = /arch:VFPv3
 !endif
 !if "$(WITH_NEON)" != ""
 CFLAGS = $(CFLAGS) $(NEON_ARCH)
-WFLAGS = $(WFLAGS) -D__ARM_NEON__=1 -DARM_NEON_ADLER32 -DARM_NEON_SLIDEHASH -DARM_NOCHECK_NEON
+WFLAGS = $(WFLAGS) \
+       -D__ARM_NEON__=1 \
+       -DARM_NEON_ADLER32 \
+       -DARM_NEON_SLIDEHASH \
+       -DARM_NOCHECK_NEON \
+       #
 OBJS = $(OBJS) adler32_neon.obj slide_neon.obj
 !endif
 

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 9bfb70fb757065274fd5cbd6654776ac6b959ebe..8bfa91bb39bff0419cf643c2ee6bfde8cac3081f 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -23,7 +23,18 @@ AR = lib
 RC = rc
 CP = copy /y
 CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DX86_PCLMULQDQ_CRC -DX86_SSE2 -DX86_CPUID -DX86_SSE42_CRC_INTRIN -DX86_SSE42_CRC_HASH -DX86_AVX2 -DUNALIGNED_OK -DUNALIGNED64_OK
+WFLAGS  = \
+       -D_CRT_SECURE_NO_DEPRECATE \
+       -D_CRT_NONSTDC_NO_DEPRECATE \
+       -DX86_CPUID \
+       -DX86_PCLMULQDQ_CRC \
+       -DX86_SSE2 \
+       -DX86_SSE42_CRC_INTRIN \
+       -DX86_SSE42_CRC_HASH \
+       -DX86_AVX2 \
+       -DUNALIGNED_OK \
+       -DUNALIGNED64_OK \
+       #
 LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
 ARFLAGS = -nologo
 RCFLAGS = /dWIN32 /r
@@ -59,8 +70,8 @@ OBJS = \
        trees.obj \
        uncompr.obj \
        zutil.obj \
-       x86.obj
-
+       x86.obj \
+       #
 !if "$(ZLIB_COMPAT)" != ""
 WITH_GZFILEOP = yes
 WFLAGS = $(WFLAGS) -DZLIB_COMPAT