diff options
author | jK <jk3064@arcor.de> | 2012-03-26 20:18:13 +0200 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2012-03-26 20:17:41 -0700 |
commit | ba04838a74202955f7b8dfb66af5345bf5eaeb00 (patch) | |
tree | ebd403725ba65473303987053c8df787a16ce24c /contrib/minizip/Makefile.am | |
parent | 11f4065ea938c503a6c690b66d1503582fdb7a6f (diff) | |
download | zlib-ba04838a74202955f7b8dfb66af5345bf5eaeb00.tar.gz zlib-ba04838a74202955f7b8dfb66af5345bf5eaeb00.tar.bz2 zlib-ba04838a74202955f7b8dfb66af5345bf5eaeb00.zip |
Fix contrib/minizip compilation in the MinGW environment.
Diffstat (limited to 'contrib/minizip/Makefile.am')
-rw-r--r-- | contrib/minizip/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am index 2ced913..d343011 100644 --- a/contrib/minizip/Makefile.am +++ b/contrib/minizip/Makefile.am | |||
@@ -10,11 +10,17 @@ zlib_top_builddir = $(top_builddir)/../.. | |||
10 | AM_CPPFLAGS = -I$(zlib_top_srcdir) | 10 | AM_CPPFLAGS = -I$(zlib_top_srcdir) |
11 | AM_LDFLAGS = -L$(zlib_top_builddir) | 11 | AM_LDFLAGS = -L$(zlib_top_builddir) |
12 | 12 | ||
13 | if WIN32 | ||
14 | iowin32_src = iowin32.c | ||
15 | iowin32_h = iowin32.h | ||
16 | endif | ||
17 | |||
13 | libminizip_la_SOURCES = \ | 18 | libminizip_la_SOURCES = \ |
14 | ioapi.c \ | 19 | ioapi.c \ |
15 | mztools.c \ | 20 | mztools.c \ |
16 | unzip.c \ | 21 | unzip.c \ |
17 | zip.c | 22 | zip.c \ |
23 | ${iowin32_src} | ||
18 | 24 | ||
19 | libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz | 25 | libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz |
20 | 26 | ||
@@ -24,7 +30,8 @@ minizip_include_HEADERS = \ | |||
24 | ioapi.h \ | 30 | ioapi.h \ |
25 | mztools.h \ | 31 | mztools.h \ |
26 | unzip.h \ | 32 | unzip.h \ |
27 | zip.h | 33 | zip.h \ |
34 | ${iowin32_h} | ||
28 | 35 | ||
29 | pkgconfigdir = $(libdir)/pkgconfig | 36 | pkgconfigdir = $(libdir)/pkgconfig |
30 | pkgconfig_DATA = minizip.pc | 37 | pkgconfig_DATA = minizip.pc |