diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-11 11:04:49 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-11 11:04:49 -0700 |
| commit | 10daf0d4d7815447799d555d04d30325836e1d44 (patch) | |
| tree | 75579fbe11e42dc3197acca53f5f887ac3808b57 /win32 | |
| parent | 9712272c78b9d9c93746d9c8e156a3728c65ca72 (diff) | |
| download | zlib-10daf0d4d7815447799d555d04d30325836e1d44.tar.gz | |
zlib 1.2.5.1v1.2.5.1
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.gcc | 14 | ||||
| -rw-r--r-- | win32/Makefile.msc | 2 | ||||
| -rw-r--r-- | win32/zlib.def | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc index 0a33bf6..43825c0 100644 --- a/win32/Makefile.gcc +++ b/win32/Makefile.gcc @@ -25,7 +25,7 @@ STATICLIB = libz.a SHAREDLIB = zlib1.dll -IMPLIB = libzdll.a +IMPLIB = libz.dll.a # # Set to 1 if shared object needs to be installed @@ -59,7 +59,7 @@ CP = cp -fp INSTALL = $(CP) RM = rm -f -prefix = /usr/local +prefix ?= /usr/local exec_prefix = $(prefix) OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \ @@ -118,7 +118,7 @@ zlibrc.o: win32/zlib1.rc install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) -@mkdir -p $(INCLUDE_PATH) - -@mkdir -p $(LIBRARY_PATH) + -@mkdir -p $(LIBRARY_PATH) $(LIBRARY_PATH)/pkgconfig -if [ "$(SHARED_MODE)" = "1" ]; then \ mkdir -p $(BINARY_PATH); \ $(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \ @@ -127,6 +127,14 @@ install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) -$(INSTALL) zlib.h $(INCLUDE_PATH) -$(INSTALL) zconf.h $(INCLUDE_PATH) -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH) + sed \ + -e 's|@prefix@|${prefix}|g' \ + -e 's|@exec_prefix@|${exec_prefix}|g' \ + -e 's|@libdir@|$(LIBRARY_PATH)|g' \ + -e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \ + -e 's|@includedir@|$(INCLUDE_PATH)|g' \ + -e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \ + zlib.pc.in > $(LIBRARY_PATH)/pkgconfig/zlib.pc uninstall: -if [ "$(SHARED_MODE)" = "1" ]; then \ diff --git a/win32/Makefile.msc b/win32/Makefile.msc index fa10a1a..2714b45 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -30,7 +30,7 @@ ARFLAGS = -nologo RCFLAGS = /dWIN32 /r OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \ - gzwrite.obj infback.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + gzwrite.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj OBJA = diff --git a/win32/zlib.def b/win32/zlib.def index 03df8bf..d2e09f2 100644 --- a/win32/zlib.def +++ b/win32/zlib.def @@ -15,6 +15,7 @@ EXPORTS deflateParams deflateTune deflateBound + deflatePending deflatePrime deflateSetHeader inflateSetDictionary |