upgrade to zlib 1.2.6
This commit is contained in:
laurent.perron@gmail.com
157
dependencies/solutions/Makefile.msc
vendored
157
dependencies/solutions/Makefile.msc
vendored
@@ -1,157 +0,0 @@
|
||||
# Makefile for zlib using Microsoft (Visual) C
|
||||
# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
|
||||
#
|
||||
# Usage:
|
||||
# nmake -f win32/Makefile.msc (standard build)
|
||||
# nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build)
|
||||
# nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
|
||||
# OBJA="inffas32.obj match686.obj" (use ASM code, x86)
|
||||
# nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF" \
|
||||
# OBJA="inffasx64.obj gvmat64.obj inffas8664.c" (use ASM code, x64)
|
||||
|
||||
# optional build flags
|
||||
LOC =
|
||||
|
||||
# variables
|
||||
STATICLIB = zlib.lib
|
||||
SHAREDLIB = zlib1.dll
|
||||
IMPLIB = zdll.lib
|
||||
|
||||
CC = cl
|
||||
AS = ml
|
||||
LD = link
|
||||
AR = lib
|
||||
RC = rc
|
||||
CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
|
||||
WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
|
||||
ASFLAGS = -coff -Zi $(LOC)
|
||||
LDFLAGS = -nologo -debug -incremental:no -opt:ref
|
||||
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 inffast.obj
|
||||
OBJA =
|
||||
|
||||
|
||||
# targets
|
||||
all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
|
||||
example.exe minigzip.exe example_d.exe minigzip_d.exe
|
||||
|
||||
$(STATICLIB): $(OBJS) $(OBJA)
|
||||
$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA)
|
||||
|
||||
$(IMPLIB): $(SHAREDLIB)
|
||||
|
||||
$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res
|
||||
$(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \
|
||||
-out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
|
||||
if exist $@.manifest \
|
||||
mt -nologo -manifest $@.manifest -outputresource:$@;2
|
||||
|
||||
example.exe: example.obj $(STATICLIB)
|
||||
$(LD) $(LDFLAGS) example.obj $(STATICLIB)
|
||||
if exist $@.manifest \
|
||||
mt -nologo -manifest $@.manifest -outputresource:$@;1
|
||||
|
||||
minigzip.exe: minigzip.obj $(STATICLIB)
|
||||
$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
|
||||
if exist $@.manifest \
|
||||
mt -nologo -manifest $@.manifest -outputresource:$@;1
|
||||
|
||||
example_d.exe: example.obj $(IMPLIB)
|
||||
$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
|
||||
if exist $@.manifest \
|
||||
mt -nologo -manifest $@.manifest -outputresource:$@;1
|
||||
|
||||
minigzip_d.exe: minigzip.obj $(IMPLIB)
|
||||
$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
|
||||
if exist $@.manifest \
|
||||
mt -nologo -manifest $@.manifest -outputresource:$@;1
|
||||
|
||||
.c.obj:
|
||||
$(CC) -c $(WFLAGS) $(CFLAGS) $<
|
||||
|
||||
{contrib/masmx64}.c.obj:
|
||||
$(CC) -c $(WFLAGS) $(CFLAGS) $<
|
||||
|
||||
{contrib/masmx64}.asm.obj:
|
||||
$(AS) -c $(ASFLAGS) $<
|
||||
|
||||
{contrib/masmx86}.asm.obj:
|
||||
$(AS) -c $(ASFLAGS) $<
|
||||
|
||||
adler32.obj: adler32.c zlib.h zconf.h
|
||||
|
||||
compress.obj: compress.c zlib.h zconf.h
|
||||
|
||||
crc32.obj: crc32.c zlib.h zconf.h crc32.h
|
||||
|
||||
deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
|
||||
|
||||
gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
|
||||
|
||||
gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
|
||||
|
||||
gzread.obj: gzread.c zlib.h zconf.h gzguts.h
|
||||
|
||||
gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
|
||||
|
||||
infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h inffixed.h
|
||||
|
||||
inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h
|
||||
|
||||
inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h inffixed.h
|
||||
|
||||
inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
|
||||
|
||||
trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
|
||||
|
||||
uncompr.obj: uncompr.c zlib.h zconf.h
|
||||
|
||||
zutil.obj: zutil.c zutil.h zlib.h zconf.h
|
||||
|
||||
gvmat64.obj: contrib\masmx64\gvmat64.asm
|
||||
|
||||
inffasx64.obj: contrib\masmx64\inffasx64.asm
|
||||
|
||||
inffas8664.obj: contrib\masmx64\inffas8664.c zutil.h zlib.h zconf.h \
|
||||
inftrees.h inflate.h inffast.h
|
||||
|
||||
inffas32.obj: contrib\masmx86\inffas32.asm
|
||||
|
||||
match686.obj: contrib\masmx86\match686.asm
|
||||
|
||||
example.obj: example.c zlib.h zconf.h
|
||||
|
||||
minigzip.obj: minigzip.c zlib.h zconf.h
|
||||
|
||||
zlib1.res: win32/zlib1.rc
|
||||
$(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc
|
||||
|
||||
|
||||
# testing
|
||||
test: example.exe minigzip.exe
|
||||
example
|
||||
echo hello world | minigzip | minigzip -d
|
||||
|
||||
testdll: example_d.exe minigzip_d.exe
|
||||
example_d
|
||||
echo hello world | minigzip_d | minigzip_d -d
|
||||
|
||||
|
||||
# cleanup
|
||||
clean:
|
||||
-del $(STATICLIB)
|
||||
-del $(SHAREDLIB)
|
||||
-del $(IMPLIB)
|
||||
-del *.obj
|
||||
-del *.res
|
||||
-del *.exp
|
||||
-del *.exe
|
||||
-del *.pdb
|
||||
-del *.manifest
|
||||
-del foo.gz
|
||||
@@ -52,7 +52,7 @@ build_third_party: \
|
||||
# install_scip
|
||||
|
||||
download_third_party: \
|
||||
dependencies/archives/zlib125.zip \
|
||||
dependencies/archives/zlib126.zip \
|
||||
dependencies/sources/gflags/autogen.sh \
|
||||
dependencies/sources/protobuf/autogen.sh \
|
||||
dependencies/sources/sparsehash/autogen.sh \
|
||||
@@ -95,24 +95,23 @@ dependencies/install:
|
||||
# Install zlib
|
||||
install_zlib: dependencies\install\include\zlib.h dependencies\install\include\zconf.h dependencies\install\lib\zlib.lib
|
||||
|
||||
dependencies\install\include\zlib.h: dependencies\sources\zlib-1.2.5\zlib.h
|
||||
copy dependencies\sources\zlib-1.2.5\zlib.h dependencies\install\include
|
||||
dependencies\install\include\zlib.h: dependencies\sources\zlib-1.2.6\zlib.h
|
||||
copy dependencies\sources\zlib-1.2.6\zlib.h dependencies\install\include
|
||||
|
||||
dependencies\install\include\zconf.h: dependencies\sources\zlib-1.2.5\zlib.h
|
||||
copy dependencies\sources\zlib-1.2.5\zconf.h dependencies\install\include
|
||||
dependencies\install\include\zconf.h: dependencies\sources\zlib-1.2.6\zlib.h
|
||||
copy dependencies\sources\zlib-1.2.6\zconf.h dependencies\install\include
|
||||
tools\touch.exe dependencies\install\include\zconf.h
|
||||
|
||||
dependencies\install\lib\zlib.lib: dependencies\sources\zlib-1.2.5\zlib.h
|
||||
copy dependencies\solutions\Makefile.msc dependencies\sources\zlib-1.2.5
|
||||
cd dependencies\sources\zlib-1.2.5 && nmake -f Makefile.msc
|
||||
copy dependencies\sources\zlib-1.2.5\zlib.lib dependencies\install\lib
|
||||
dependencies\install\lib\zlib.lib: dependencies\sources\zlib-1.2.6\zlib.h
|
||||
cd dependencies\sources\zlib-1.2.6 && nmake -f win32\Makefile.msc zlib.lib
|
||||
copy dependencies\sources\zlib-1.2.6\zlib.lib dependencies\install\lib
|
||||
|
||||
dependencies\sources\zlib-1.2.5\zlib.h: dependencies\archives\zlib125.zip
|
||||
tools\unzip -d dependencies\sources dependencies\archives\zlib125.zip
|
||||
tools\touch.exe dependencies\sources\zlib-1.2.5\zlib.h
|
||||
dependencies\sources\zlib-1.2.6\zlib.h: dependencies\archives\zlib126.zip
|
||||
tools\unzip -d dependencies\sources dependencies\archives\zlib126.zip
|
||||
tools\touch.exe dependencies\sources\zlib-1.2.6\zlib.h
|
||||
|
||||
dependencies\archives\zlib125.zip:
|
||||
tools\wget -P dependencies\archives http://zlib.net/zlib125.zip
|
||||
dependencies\archives\zlib126.zip:
|
||||
tools\wget -P dependencies\archives http://zlib.net/zlib126.zip
|
||||
|
||||
# Install google-gflags.
|
||||
install_gflags: dependencies\install\lib\libgflags.lib dependencies\install\include\gflags\gflags.h
|
||||
|
||||
Reference in New Issue
Block a user