Link zlib statically for windows (#35)
* Add zlib 1.2.11 sources * link zlib statically for windows
This commit is contained in:
		
				
					committed by
					
						
						Benjamin Sergeant
					
				
			
			
				
	
			
			
			
						parent
						
							e3d0c899d3
						
					
				
				
					commit
					4eded01841
				
			
							
								
								
									
										136
									
								
								third_party/zlib/old/os2/Makefile.os2
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										136
									
								
								third_party/zlib/old/os2/Makefile.os2
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,136 @@
 | 
			
		||||
# Makefile for zlib under OS/2 using GCC (PGCC)
 | 
			
		||||
# For conditions of distribution and use, see copyright notice in zlib.h
 | 
			
		||||
 | 
			
		||||
# To compile and test, type:
 | 
			
		||||
#   cp Makefile.os2 ..
 | 
			
		||||
#   cd ..
 | 
			
		||||
#   make -f Makefile.os2 test
 | 
			
		||||
 | 
			
		||||
# This makefile will build a static library z.lib, a shared library
 | 
			
		||||
# z.dll and a import library zdll.lib. You can use either z.lib or
 | 
			
		||||
# zdll.lib by specifying either -lz or -lzdll on gcc's command line
 | 
			
		||||
 | 
			
		||||
CC=gcc -Zomf -s
 | 
			
		||||
 | 
			
		||||
CFLAGS=-O6 -Wall
 | 
			
		||||
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 | 
			
		||||
#CFLAGS=-g -DZLIB_DEBUG
 | 
			
		||||
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 | 
			
		||||
#           -Wstrict-prototypes -Wmissing-prototypes
 | 
			
		||||
 | 
			
		||||
#################### BUG WARNING: #####################
 | 
			
		||||
## infcodes.c hits a bug in pgcc-1.0, so you have to use either
 | 
			
		||||
## -O# where # <= 4 or one of (-fno-ommit-frame-pointer or -fno-force-mem)
 | 
			
		||||
## This bug is reportedly fixed in pgcc >1.0, but this was not tested
 | 
			
		||||
CFLAGS+=-fno-force-mem
 | 
			
		||||
 | 
			
		||||
LDFLAGS=-s -L. -lzdll -Zcrtdll
 | 
			
		||||
LDSHARED=$(CC) -s -Zomf -Zdll -Zcrtdll
 | 
			
		||||
 | 
			
		||||
VER=1.1.0
 | 
			
		||||
ZLIB=z.lib
 | 
			
		||||
SHAREDLIB=z.dll
 | 
			
		||||
SHAREDLIBIMP=zdll.lib
 | 
			
		||||
LIBS=$(ZLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
 | 
			
		||||
 | 
			
		||||
AR=emxomfar cr
 | 
			
		||||
IMPLIB=emximp
 | 
			
		||||
RANLIB=echo
 | 
			
		||||
TAR=tar
 | 
			
		||||
SHELL=bash
 | 
			
		||||
 | 
			
		||||
prefix=/usr/local
 | 
			
		||||
exec_prefix = $(prefix)
 | 
			
		||||
 | 
			
		||||
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
 | 
			
		||||
       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
 | 
			
		||||
 | 
			
		||||
TEST_OBJS = example.o minigzip.o
 | 
			
		||||
 | 
			
		||||
DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
 | 
			
		||||
  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
 | 
			
		||||
  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
 | 
			
		||||
  contrib/asm386/*.asm contrib/asm386/*.c \
 | 
			
		||||
  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
 | 
			
		||||
  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
 | 
			
		||||
  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
 | 
			
		||||
 | 
			
		||||
all: example.exe minigzip.exe
 | 
			
		||||
 | 
			
		||||
test: all
 | 
			
		||||
	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
 | 
			
		||||
	echo hello world | ./minigzip | ./minigzip -d || \
 | 
			
		||||
	  echo '		*** minigzip test FAILED ***' ; \
 | 
			
		||||
	if ./example; then \
 | 
			
		||||
	  echo '		*** zlib test OK ***'; \
 | 
			
		||||
	else \
 | 
			
		||||
	  echo '		*** zlib test FAILED ***'; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
$(ZLIB): $(OBJS)
 | 
			
		||||
	$(AR) $@ $(OBJS)
 | 
			
		||||
	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 | 
			
		||||
 | 
			
		||||
$(SHAREDLIB): $(OBJS) os2/z.def
 | 
			
		||||
	$(LDSHARED) -o $@ $^
 | 
			
		||||
 | 
			
		||||
$(SHAREDLIBIMP): os2/z.def
 | 
			
		||||
	$(IMPLIB) -o $@ $^
 | 
			
		||||
 | 
			
		||||
example.exe: example.o $(LIBS)
 | 
			
		||||
	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 | 
			
		||||
 | 
			
		||||
minigzip.exe: minigzip.o $(LIBS)
 | 
			
		||||
	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 | 
			
		||||
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
 | 
			
		||||
 | 
			
		||||
distclean:	clean
 | 
			
		||||
 | 
			
		||||
zip:
 | 
			
		||||
	mv Makefile Makefile~; cp -p Makefile.in Makefile
 | 
			
		||||
	rm -f test.c ztest*.c
 | 
			
		||||
	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
 | 
			
		||||
	zip -ul9 zlib$$v $(DISTFILES)
 | 
			
		||||
	mv Makefile~ Makefile
 | 
			
		||||
 | 
			
		||||
dist:
 | 
			
		||||
	mv Makefile Makefile~; cp -p Makefile.in Makefile
 | 
			
		||||
	rm -f test.c ztest*.c
 | 
			
		||||
	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
 | 
			
		||||
	rm -f $$d.tar.gz; \
 | 
			
		||||
	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
 | 
			
		||||
	files=""; \
 | 
			
		||||
	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
 | 
			
		||||
	cd ..; \
 | 
			
		||||
	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
 | 
			
		||||
	if test ! -d $$d; then rm -f $$d; fi
 | 
			
		||||
	mv Makefile~ Makefile
 | 
			
		||||
 | 
			
		||||
tags:
 | 
			
		||||
	etags *.[ch]
 | 
			
		||||
 | 
			
		||||
depend:
 | 
			
		||||
	makedepend -- $(CFLAGS) -- *.[ch]
 | 
			
		||||
 | 
			
		||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
 | 
			
		||||
 | 
			
		||||
adler32.o: zlib.h zconf.h
 | 
			
		||||
compress.o: zlib.h zconf.h
 | 
			
		||||
crc32.o: zlib.h zconf.h
 | 
			
		||||
deflate.o: deflate.h zutil.h zlib.h zconf.h
 | 
			
		||||
example.o: zlib.h zconf.h
 | 
			
		||||
gzio.o: zutil.h zlib.h zconf.h
 | 
			
		||||
infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
 | 
			
		||||
infcodes.o: zutil.h zlib.h zconf.h
 | 
			
		||||
infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
 | 
			
		||||
inffast.o: zutil.h zlib.h zconf.h inftrees.h
 | 
			
		||||
inffast.o: infblock.h infcodes.h infutil.h inffast.h
 | 
			
		||||
inflate.o: zutil.h zlib.h zconf.h infblock.h
 | 
			
		||||
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
 | 
			
		||||
infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
 | 
			
		||||
minigzip.o: zlib.h zconf.h
 | 
			
		||||
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
 | 
			
		||||
uncompr.o: zlib.h zconf.h
 | 
			
		||||
zutil.o: zutil.h zlib.h zconf.h
 | 
			
		||||
							
								
								
									
										51
									
								
								third_party/zlib/old/os2/zlib.def
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								third_party/zlib/old/os2/zlib.def
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,51 @@
 | 
			
		||||
;
 | 
			
		||||
; Slightly modified version of ../nt/zlib.dnt :-)
 | 
			
		||||
;
 | 
			
		||||
 | 
			
		||||
LIBRARY		Z
 | 
			
		||||
DESCRIPTION	"Zlib compression library for OS/2"
 | 
			
		||||
CODE		PRELOAD MOVEABLE DISCARDABLE
 | 
			
		||||
DATA		PRELOAD MOVEABLE MULTIPLE
 | 
			
		||||
 | 
			
		||||
EXPORTS
 | 
			
		||||
    adler32
 | 
			
		||||
    compress
 | 
			
		||||
    crc32
 | 
			
		||||
    deflate
 | 
			
		||||
    deflateCopy
 | 
			
		||||
    deflateEnd
 | 
			
		||||
    deflateInit2_
 | 
			
		||||
    deflateInit_
 | 
			
		||||
    deflateParams
 | 
			
		||||
    deflateReset
 | 
			
		||||
    deflateSetDictionary
 | 
			
		||||
    gzclose
 | 
			
		||||
    gzdopen
 | 
			
		||||
    gzerror
 | 
			
		||||
    gzflush
 | 
			
		||||
    gzopen
 | 
			
		||||
    gzread
 | 
			
		||||
    gzwrite
 | 
			
		||||
    inflate
 | 
			
		||||
    inflateEnd
 | 
			
		||||
    inflateInit2_
 | 
			
		||||
    inflateInit_
 | 
			
		||||
    inflateReset
 | 
			
		||||
    inflateSetDictionary
 | 
			
		||||
    inflateSync
 | 
			
		||||
    uncompress
 | 
			
		||||
    zlibVersion
 | 
			
		||||
    gzprintf
 | 
			
		||||
    gzputc
 | 
			
		||||
    gzgetc
 | 
			
		||||
    gzseek
 | 
			
		||||
    gzrewind
 | 
			
		||||
    gztell
 | 
			
		||||
    gzeof
 | 
			
		||||
    gzsetparams
 | 
			
		||||
    zError
 | 
			
		||||
    inflateSyncPoint
 | 
			
		||||
    get_crc_table
 | 
			
		||||
    compress2
 | 
			
		||||
    gzputs
 | 
			
		||||
    gzgets
 | 
			
		||||
		Reference in New Issue
	
	Block a user