From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 30 Oct 2015 10:51:28 +0000 (+0200)
Subject: Enable optimizations for MSVC and fix compiler warnings.
X-Git-Tag: 1.9.9-b1~793^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9007538c0000eb05a2ed3a32c22be267a33cd03;p=thirdparty%2Fzlib-ng.git

Enable optimizations for MSVC and fix compiler warnings.
---

diff --git a/test/minigzip.c b/test/minigzip.c
index 5f5289aa3..0907e2c9f 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -190,7 +190,7 @@ int gzread(gzFile gz, void *buf, unsigned len)
             if (got == 0)
                 break;
             strm->next_in = gz->buf;
-            strm->avail_in = got;
+            strm->avail_in = (uInt) got;
         }
         ret = inflate(strm, Z_NO_FLUSH);
         if (ret == Z_DATA_ERROR) {
diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index a1100024c..b1571c969 100644
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -23,7 +23,7 @@ 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
+WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DX86_PCLMULQDQ_CRC -DX86_SSE2_FILL_WINDOW -DX86_CPUID -DX86_SSE4_2_CRC_HASH -DUNALIGNED_OK -DUNROLL_LESS
 LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
 ARFLAGS = -nologo
 RCFLAGS = /dWIN32 /r
@@ -31,7 +31,7 @@ DEFFILE = zlib.def
 WITH_GZFILEOP =
 
 OBJS = adler32.obj compress.obj crc32.obj deflate.obj \
-       infback.obj inflate.obj inftrees.obj inffast.obj match.obj trees.obj uncompr.obj zutil.obj
+       infback.obj inflate.obj inftrees.obj inffast.obj match.obj trees.obj uncompr.obj zutil.obj x86.obj fill_window_sse.obj crc_folding.obj
 !if "$(WITH_GZFILEOP)" != ""
 WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
 OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj
@@ -76,6 +76,9 @@ minigzip_d.exe: minigzip.obj $(IMPLIB)
 {$(TOP)}.c.obj:
 	$(CC) -c $(WFLAGS) $(CFLAGS) $<
 
+{$(TOP)/arch/x86}.c.obj:
+	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
+
 {$(TOP)/test}.c.obj:
 	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<