diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:22:37 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:22:37 -0700 |
commit | 4b5a43a219d51066c01ff2ab86af18b967f2d0dd (patch) | |
tree | 4dcaf0cd18751d04cf638a9a6ec521990d4f2e90 /old/nt | |
parent | 086e982175da84b3db958191031380794315f95f (diff) | |
download | zlib-1.2.0.5.tar.gz zlib-1.2.0.5.tar.bz2 zlib-1.2.0.5.zip |
zlib 1.2.0.5v1.2.0.5
Diffstat (limited to '')
-rw-r--r-- | old/nt/Makefile.emx | 138 | ||||
-rw-r--r-- | old/nt/Makefile.nt | 88 | ||||
-rw-r--r-- | old/nt/zlib.dnt | 47 | ||||
-rw-r--r-- | win32/Makefile.emx (renamed from old/nt/Makefile.gcc) | 44 |
4 files changed, 13 insertions, 304 deletions
diff --git a/old/nt/Makefile.emx b/old/nt/Makefile.emx deleted file mode 100644 index 2d475b1..0000000 --- a/old/nt/Makefile.emx +++ /dev/null | |||
@@ -1,138 +0,0 @@ | |||
1 | # Makefile for zlib. Modified for emx/rsxnt by Chr. Spieler, 6/16/98. | ||
2 | # Copyright (C) 1995-1998 Jean-loup Gailly. | ||
3 | # For conditions of distribution and use, see copyright notice in zlib.h | ||
4 | |||
5 | # To compile, or to compile and test, type: | ||
6 | # | ||
7 | # make -fmakefile.emx; make test -fmakefile.emx | ||
8 | # | ||
9 | |||
10 | CC=gcc -Zwin32 | ||
11 | |||
12 | #CFLAGS=-MMD -O | ||
13 | #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 | ||
14 | #CFLAGS=-MMD -g -DDEBUG | ||
15 | CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ | ||
16 | -Wstrict-prototypes -Wmissing-prototypes | ||
17 | |||
18 | # If cp.exe is available, replace "copy /Y" with "cp -fp" . | ||
19 | CP=copy /Y | ||
20 | # If gnu install.exe is available, replace $(CP) with ginstall. | ||
21 | INSTALL=$(CP) | ||
22 | # The default value of RM is "rm -f." If "rm.exe" is found, comment out: | ||
23 | RM=del | ||
24 | LDLIBS=-L. -lzlib | ||
25 | LD=$(CC) -s -o | ||
26 | LDSHARED=$(CC) | ||
27 | |||
28 | INCL=zlib.h zconf.h | ||
29 | LIBS=zlib.a | ||
30 | |||
31 | AR=ar rcs | ||
32 | |||
33 | prefix=/usr/local | ||
34 | exec_prefix = $(prefix) | ||
35 | |||
36 | OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ | ||
37 | zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o | ||
38 | |||
39 | TEST_OBJS = example.o minigzip.o | ||
40 | |||
41 | all: example.exe minigzip.exe | ||
42 | |||
43 | test: all | ||
44 | ./example | ||
45 | echo hello world | .\minigzip | .\minigzip -d | ||
46 | |||
47 | %.o : %.c | ||
48 | $(CC) $(CFLAGS) -c $< -o $@ | ||
49 | |||
50 | zlib.a: $(OBJS) | ||
51 | $(AR) $@ $(OBJS) | ||
52 | |||
53 | %.exe : %.o $(LIBS) | ||
54 | $(LD) $@ $< $(LDLIBS) | ||
55 | |||
56 | |||
57 | .PHONY : clean | ||
58 | |||
59 | clean: | ||
60 | $(RM) *.d | ||
61 | $(RM) *.o | ||
62 | $(RM) *.exe | ||
63 | $(RM) zlib.a | ||
64 | $(RM) foo.gz | ||
65 | |||
66 | DEPS := $(wildcard *.d) | ||
67 | ifneq ($(DEPS),) | ||
68 | include $(DEPS) | ||
69 | endif | ||
70 | # Makefile for zlib. Modified for emx 0.9c by Chr. Spieler, 6/17/98. | ||
71 | # Copyright (C) 1995-1998 Jean-loup Gailly. | ||
72 | # For conditions of distribution and use, see copyright notice in zlib.h | ||
73 | |||
74 | # To compile, or to compile and test, type: | ||
75 | # | ||
76 | # make -fmakefile.emx; make test -fmakefile.emx | ||
77 | # | ||
78 | |||
79 | CC=gcc | ||
80 | |||
81 | #CFLAGS=-MMD -O | ||
82 | #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 | ||
83 | #CFLAGS=-MMD -g -DDEBUG | ||
84 | CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ | ||
85 | -Wstrict-prototypes -Wmissing-prototypes | ||
86 | |||
87 | # If cp.exe is available, replace "copy /Y" with "cp -fp" . | ||
88 | CP=copy /Y | ||
89 | # If gnu install.exe is available, replace $(CP) with ginstall. | ||
90 | INSTALL=$(CP) | ||
91 | # The default value of RM is "rm -f." If "rm.exe" is found, comment out: | ||
92 | RM=del | ||
93 | LDLIBS=-L. -lzlib | ||
94 | LD=$(CC) -s -o | ||
95 | LDSHARED=$(CC) | ||
96 | |||
97 | INCL=zlib.h zconf.h | ||
98 | LIBS=zlib.a | ||
99 | |||
100 | AR=ar rcs | ||
101 | |||
102 | prefix=/usr/local | ||
103 | exec_prefix = $(prefix) | ||
104 | |||
105 | OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ | ||
106 | zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o | ||
107 | |||
108 | TEST_OBJS = example.o minigzip.o | ||
109 | |||
110 | all: example.exe minigzip.exe | ||
111 | |||
112 | test: all | ||
113 | ./example | ||
114 | echo hello world | .\minigzip | .\minigzip -d | ||
115 | |||
116 | %.o : %.c | ||
117 | $(CC) $(CFLAGS) -c $< -o $@ | ||
118 | |||
119 | zlib.a: $(OBJS) | ||
120 | $(AR) $@ $(OBJS) | ||
121 | |||
122 | %.exe : %.o $(LIBS) | ||
123 | $(LD) $@ $< $(LDLIBS) | ||
124 | |||
125 | |||
126 | .PHONY : clean | ||
127 | |||
128 | clean: | ||
129 | $(RM) *.d | ||
130 | $(RM) *.o | ||
131 | $(RM) *.exe | ||
132 | $(RM) zlib.a | ||
133 | $(RM) foo.gz | ||
134 | |||
135 | DEPS := $(wildcard *.d) | ||
136 | ifneq ($(DEPS),) | ||
137 | include $(DEPS) | ||
138 | endif | ||
diff --git a/old/nt/Makefile.nt b/old/nt/Makefile.nt deleted file mode 100644 index b250f2a..0000000 --- a/old/nt/Makefile.nt +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | # Makefile for zlib | ||
2 | |||
3 | !include <ntwin32.mak> | ||
4 | |||
5 | CC=cl | ||
6 | LD=link | ||
7 | CFLAGS=-O -nologo | ||
8 | LDFLAGS= | ||
9 | O=.obj | ||
10 | |||
11 | # variables | ||
12 | OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ | ||
13 | trees$(O) | ||
14 | OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ | ||
15 | infutil$(O) inffast$(O) | ||
16 | |||
17 | all: zlib.dll example.exe minigzip.exe | ||
18 | |||
19 | adler32.obj: adler32.c zutil.h zlib.h zconf.h | ||
20 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
21 | |||
22 | compress.obj: compress.c zlib.h zconf.h | ||
23 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
24 | |||
25 | crc32.obj: crc32.c zutil.h zlib.h zconf.h | ||
26 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
27 | |||
28 | deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | ||
29 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
30 | |||
31 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
32 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
33 | |||
34 | infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\ | ||
35 | infcodes.h infutil.h | ||
36 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
37 | |||
38 | infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\ | ||
39 | infcodes.h inffast.h | ||
40 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
41 | |||
42 | inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h | ||
43 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
44 | |||
45 | inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h | ||
46 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
47 | |||
48 | infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h | ||
49 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
50 | |||
51 | inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h | ||
52 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
53 | |||
54 | trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h | ||
55 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
56 | |||
57 | uncompr.obj: uncompr.c zlib.h zconf.h | ||
58 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
59 | |||
60 | zutil.obj: zutil.c zutil.h zlib.h zconf.h | ||
61 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
62 | |||
63 | example.obj: example.c zlib.h zconf.h | ||
64 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
65 | |||
66 | minigzip.obj: minigzip.c zlib.h zconf.h | ||
67 | $(CC) -c $(cvarsdll) $(CFLAGS) $*.c | ||
68 | |||
69 | zlib.dll: $(OBJ1) $(OBJ2) zlib.dnt | ||
70 | link $(dlllflags) -out:$@ -def:zlib.dnt $(OBJ1) $(OBJ2) $(guilibsdll) | ||
71 | |||
72 | zlib.lib: zlib.dll | ||
73 | |||
74 | example.exe: example.obj zlib.lib | ||
75 | $(LD) $(LDFLAGS) example.obj zlib.lib | ||
76 | |||
77 | minigzip.exe: minigzip.obj zlib.lib | ||
78 | $(LD) $(LDFLAGS) minigzip.obj zlib.lib | ||
79 | |||
80 | test: example.exe minigzip.exe | ||
81 | example | ||
82 | echo hello world | minigzip | minigzip -d | ||
83 | |||
84 | clean: | ||
85 | del *.obj | ||
86 | del *.exe | ||
87 | del *.dll | ||
88 | del *.lib | ||
diff --git a/old/nt/zlib.dnt b/old/nt/zlib.dnt deleted file mode 100644 index 7f9475c..0000000 --- a/old/nt/zlib.dnt +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | LIBRARY zlib.dll | ||
2 | EXETYPE WINDOWS | ||
3 | CODE PRELOAD MOVEABLE DISCARDABLE | ||
4 | DATA PRELOAD MOVEABLE MULTIPLE | ||
5 | |||
6 | EXPORTS | ||
7 | adler32 @1 | ||
8 | compress @2 | ||
9 | crc32 @3 | ||
10 | deflate @4 | ||
11 | deflateCopy @5 | ||
12 | deflateEnd @6 | ||
13 | deflateInit2_ @7 | ||
14 | deflateInit_ @8 | ||
15 | deflateParams @9 | ||
16 | deflateReset @10 | ||
17 | deflateSetDictionary @11 | ||
18 | gzclose @12 | ||
19 | gzdopen @13 | ||
20 | gzerror @14 | ||
21 | gzflush @15 | ||
22 | gzopen @16 | ||
23 | gzread @17 | ||
24 | gzwrite @18 | ||
25 | inflate @19 | ||
26 | inflateEnd @20 | ||
27 | inflateInit2_ @21 | ||
28 | inflateInit_ @22 | ||
29 | inflateReset @23 | ||
30 | inflateSetDictionary @24 | ||
31 | inflateSync @25 | ||
32 | uncompress @26 | ||
33 | zlibVersion @27 | ||
34 | gzprintf @28 | ||
35 | gzputc @29 | ||
36 | gzgetc @30 | ||
37 | gzseek @31 | ||
38 | gzrewind @32 | ||
39 | gztell @33 | ||
40 | gzeof @34 | ||
41 | gzsetparams @35 | ||
42 | zError @36 | ||
43 | inflateSyncPoint @37 | ||
44 | get_crc_table @38 | ||
45 | compress2 @39 | ||
46 | gzputs @40 | ||
47 | gzgets @41 | ||
diff --git a/old/nt/Makefile.gcc b/win32/Makefile.emx index cdd652f..7b08424 100644 --- a/old/nt/Makefile.gcc +++ b/win32/Makefile.emx | |||
@@ -1,18 +1,13 @@ | |||
1 | # Makefile for zlib. Modified for mingw32 by C. Spieler, 6/16/98. | 1 | # Makefile for zlib. Modified for emx/rsxnt by Chr. Spieler, 6/16/98. |
2 | # (This Makefile is directly derived from Makefile.dj2) | ||
3 | # Copyright (C) 1995-1998 Jean-loup Gailly. | 2 | # Copyright (C) 1995-1998 Jean-loup Gailly. |
4 | # For conditions of distribution and use, see copyright notice in zlib.h | 3 | # For conditions of distribution and use, see copyright notice in zlib.h |
5 | 4 | ||
6 | # To compile, or to compile and test, type: | 5 | # To compile, or to compile and test, type: |
7 | # | 6 | # |
8 | # make -fmakefile.gcc; make test -fmakefile.gcc | 7 | # make -fmakefile.emx; make test -fmakefile.emx |
9 | # | 8 | # |
10 | # To install libz.a, zconf.h and zlib.h in the mingw32 directories, type: | ||
11 | # | ||
12 | # make install -fmakefile.gcc | ||
13 | # | ||
14 | 9 | ||
15 | CC=gcc | 10 | CC=gcc -Zwin32 |
16 | 11 | ||
17 | #CFLAGS=-MMD -O | 12 | #CFLAGS=-MMD -O |
18 | #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 | 13 | #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 |
@@ -26,12 +21,12 @@ CP=copy /Y | |||
26 | INSTALL=$(CP) | 21 | INSTALL=$(CP) |
27 | # The default value of RM is "rm -f." If "rm.exe" is found, comment out: | 22 | # The default value of RM is "rm -f." If "rm.exe" is found, comment out: |
28 | RM=del | 23 | RM=del |
29 | LDLIBS=-L. -lz | 24 | LDLIBS=-L. -lzlib |
30 | LD=$(CC) -s -o | 25 | LD=$(CC) -s -o |
31 | LDSHARED=$(CC) | 26 | LDSHARED=$(CC) |
32 | 27 | ||
33 | INCL=zlib.h zconf.h | 28 | INCL=zlib.h zconf.h |
34 | LIBS=libz.a | 29 | LIBS=zlib.a |
35 | 30 | ||
36 | AR=ar rcs | 31 | AR=ar rcs |
37 | 32 | ||
@@ -39,7 +34,7 @@ prefix=/usr/local | |||
39 | exec_prefix = $(prefix) | 34 | exec_prefix = $(prefix) |
40 | 35 | ||
41 | OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ | 36 | OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ |
42 | zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o | 37 | zutil.o inflate.o infback.o inftrees.o inffast.o |
43 | 38 | ||
44 | TEST_OBJS = example.o minigzip.o | 39 | TEST_OBJS = example.o minigzip.o |
45 | 40 | ||
@@ -47,38 +42,25 @@ all: example.exe minigzip.exe | |||
47 | 42 | ||
48 | test: all | 43 | test: all |
49 | ./example | 44 | ./example |
50 | echo hello world | .\minigzip | .\minigzip -d | 45 | echo hello world | .\minigzip | .\minigzip -d |
51 | 46 | ||
52 | %.o : %.c | 47 | %.o : %.c |
53 | $(CC) $(CFLAGS) -c $< -o $@ | 48 | $(CC) $(CFLAGS) -c $< -o $@ |
54 | 49 | ||
55 | libz.a: $(OBJS) | 50 | zlib.a: $(OBJS) |
56 | $(AR) $@ $(OBJS) | 51 | $(AR) $@ $(OBJS) |
57 | 52 | ||
58 | %.exe : %.o $(LIBS) | 53 | %.exe : %.o $(LIBS) |
59 | $(LD) $@ $< $(LDLIBS) | 54 | $(LD) $@ $< $(LDLIBS) |
60 | 55 | ||
61 | # INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env . | ||
62 | 56 | ||
63 | .PHONY : uninstall clean | 57 | .PHONY : clean |
64 | |||
65 | install: $(INCL) $(LIBS) | ||
66 | -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH) | ||
67 | -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH) | ||
68 | $(INSTALL) zlib.h $(INCLUDE_PATH) | ||
69 | $(INSTALL) zconf.h $(INCLUDE_PATH) | ||
70 | $(INSTALL) libz.a $(LIBRARY_PATH) | ||
71 | |||
72 | uninstall: | ||
73 | $(RM) $(INCLUDE_PATH)\zlib.h | ||
74 | $(RM) $(INCLUDE_PATH)\zconf.h | ||
75 | $(RM) $(LIBRARY_PATH)\libz.a | ||
76 | 58 | ||
77 | clean: | 59 | clean: |
78 | $(RM) *.d | 60 | $(RM) *.d |
79 | $(RM) *.o | 61 | $(RM) *.o |
80 | $(RM) *.exe | 62 | $(RM) *.exe |
81 | $(RM) libz.a | 63 | $(RM) zlib.a |
82 | $(RM) foo.gz | 64 | $(RM) foo.gz |
83 | 65 | ||
84 | DEPS := $(wildcard *.d) | 66 | DEPS := $(wildcard *.d) |