diff options
| author | Nathan Moinvaziri <nathan@nathanm.com> | 2020-06-13 20:34:07 -0700 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2020-06-25 15:30:38 +0200 |
| commit | 738a6e5b07c0495b8652c77b4879145c083ea49f (patch) | |
| tree | 0ba5ee0e3fedd6752bdc7249786421fa8481f38b /win32 | |
| parent | 09d3134a6e7c0d8c6f28cd1715a9e777cfb8bf1f (diff) | |
Separate defines on individual lines to prevent merge conflicts.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.a64 | 18 | ||||
| -rw-r--r-- | win32/Makefile.arm | 16 | ||||
| -rw-r--r-- | win32/Makefile.msc | 17 |
3 files changed, 42 insertions, 9 deletions
diff --git a/win32/Makefile.a64 b/win32/Makefile.a64 index aebfaaf..6b6a8f5 100644 --- 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 9c9d4ff..95933e2 100644 --- 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 9bfb70f..8bfa91b 100644 --- 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 |