mingw add zlib paths

Based on work from Radu Sorici <soriciradu@gmail.com>

Signed-off-by: Andy Green <andy.green@linaro.org>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 87c2c43..fec6cd4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,8 +23,8 @@ libwebsockets_la_CFLAGS:=-Wall -std=gnu99 -pedantic
 libwebsockets_la_LDFLAGS:=
 
 if MINGW
-libwebsockets_la_CFLAGS+= -w -Iwin32port/win32helpers
-libwebsockets_la_LDFLAGS+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lpthread -ldl -lws2_32 -L../win32port/win32helpers/ -lwebsock-w32
+libwebsockets_la_CFLAGS+= -w -I../win32port/win32helpers -I ../win32port/zlib/
+libwebsockets_la_LDFLAGS+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lpthread -ldl -lws2_32 -L../win32port/zlib -L../win32port/win32helpers/ -lwebsock-w32
 else
 libwebsockets_la_CFLAGS+= -rdynamic -fPIC -Werror
 libwebsockets_la_LDFLAGS+=  -version-info 0:3

diff --git a/lib/Makefile.in b/lib/Makefile.in
index af1121c..3604ce3 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -37,8 +37,8 @@ build_triplet = @build@
 host_triplet = @host@
 @EXT_GOOGLE_MUX_TRUE@am__append_1 = extension-x-google-mux.c
 @LIBCRYPTO_FALSE@am__append_2 = md5.c sha-1.c
-@MINGW_TRUE@am__append_3 = -w -Iwin32port/win32helpers
-@MINGW_TRUE@am__append_4 = -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lpthread -ldl -lws2_32 -L../win32port/win32helpers/ -lwebsock-w32
+@MINGW_TRUE@am__append_3 = -w -I../win32port/win32helpers -I ../win32port/zlib/
+@MINGW_TRUE@am__append_4 = -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lpthread -ldl -lws2_32 -L../win32port/zlib -L../win32port/win32helpers/ -lwebsock-w32
 @MINGW_FALSE@am__append_5 = -rdynamic -fPIC -Werror
 @MINGW_FALSE@am__append_6 = -version-info 0:3
 subdir = lib