diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:17:33 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:17:33 -0700 |
commit | 7850e4e406dce1f7a819297eeb151d1ca18e7cd9 (patch) | |
tree | d4befddacae46b06c4924193904de533099610b4 /msdos | |
parent | ebd3c2c0e734fc99a1360014ea52ed04fe6aade4 (diff) | |
download | zlib-1.0.7.tar.gz zlib-1.0.7.tar.bz2 zlib-1.0.7.zip |
zlib 1.0.7v1.0.7
Diffstat (limited to '')
-rw-r--r-- | msdos/Makefile.b32 (renamed from Makefile.b32) | 0 | ||||
-rw-r--r-- | msdos/Makefile.bor (renamed from Makefile.bor) | 0 | ||||
-rw-r--r-- | msdos/Makefile.dj2 (renamed from Makefile.dj2) | 33 | ||||
-rw-r--r-- | msdos/Makefile.msc (renamed from Makefile.msc) | 2 | ||||
-rw-r--r-- | msdos/Makefile.tc (renamed from Makefile.tc) | 0 | ||||
-rw-r--r-- | msdos/Makefile.wat (renamed from Makefile.wat) | 0 | ||||
-rw-r--r-- | msdos/zlib.def | 57 | ||||
-rw-r--r-- | msdos/zlib.rc (renamed from zlib.rc) | 10 |
8 files changed, 83 insertions, 19 deletions
diff --git a/Makefile.b32 b/msdos/Makefile.b32 index fc3ac68..fc3ac68 100644 --- a/Makefile.b32 +++ b/msdos/Makefile.b32 | |||
diff --git a/Makefile.bor b/msdos/Makefile.bor index 2116563..2116563 100644 --- a/Makefile.bor +++ b/msdos/Makefile.bor | |||
diff --git a/Makefile.dj2 b/msdos/Makefile.dj2 index 398f28b..0ab431c 100644 --- a/Makefile.dj2 +++ b/msdos/Makefile.dj2 | |||
@@ -1,5 +1,5 @@ | |||
1 | # Makefile for zlib. Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96. | 1 | # Makefile for zlib. Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96. |
2 | # Copyright (C) 1995-1996 Jean-loup Gailly. | 2 | # Copyright (C) 1995-1998 Jean-loup Gailly. |
3 | # 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 |
4 | 4 | ||
5 | # To compile, or to compile and test, type: | 5 | # To compile, or to compile and test, type: |
@@ -22,7 +22,8 @@ | |||
22 | # - - - - - | 22 | # - - - - - |
23 | # Alternately, these variables may be defined below, overriding the values | 23 | # Alternately, these variables may be defined below, overriding the values |
24 | # in djgpp.env, as | 24 | # in djgpp.env, as |
25 | INCLUDE_PATH=c:\usr\include | 25 | # INCLUDE_PATH=c:\usr\include |
26 | # LIBRARY_PATH=c:\usr\lib | ||
26 | 27 | ||
27 | CC=gcc | 28 | CC=gcc |
28 | 29 | ||
@@ -32,12 +33,12 @@ CC=gcc | |||
32 | CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ | 33 | CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ |
33 | -Wstrict-prototypes -Wmissing-prototypes | 34 | -Wstrict-prototypes -Wmissing-prototypes |
34 | 35 | ||
35 | # If cp.exe is not found, replace with copy /Y . | 36 | # If cp.exe is available, replace "copy /Y" with "cp -fp" . |
36 | CP=cp -f | 37 | CP=copy /Y |
37 | # If install.exe is not found, replace with $(CP). | 38 | # If gnu install.exe is available, replace $(CP) with ginstall. |
38 | INSTALL=install | 39 | INSTALL=$(CP) |
39 | # The default value of RM is "rm -f." If "rm.exe" is not found, uncomment: | 40 | # The default value of RM is "rm -f." If "rm.exe" is found, comment out: |
40 | # RM=del | 41 | RM=del |
41 | LDLIBS=-L. -lz | 42 | LDLIBS=-L. -lz |
42 | LD=$(CC) -s -o | 43 | LD=$(CC) -s -o |
43 | LDSHARED=$(CC) | 44 | LDSHARED=$(CC) |
@@ -77,15 +78,21 @@ libz.a: $(OBJS) | |||
77 | install: $(INCL) $(LIBS) | 78 | install: $(INCL) $(LIBS) |
78 | -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH) | 79 | -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH) |
79 | -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH) | 80 | -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH) |
80 | for %%f in ($(INCL)) do $(INSTALL) %%f $(INCLUDE_PATH) | 81 | $(INSTALL) zlib.h $(INCLUDE_PATH) |
81 | for %%p in ($(LIBS)) do $(INSTALL) %%p $(LIBRARY_PATH) | 82 | $(INSTALL) zconf.h $(INCLUDE_PATH) |
83 | $(INSTALL) libz.a $(LIBRARY_PATH) | ||
82 | 84 | ||
83 | uninstall: | 85 | uninstall: |
84 | for %%f in ($(INCL)) do $(RM) $(INCLUDE_PATH)\%%f | 86 | $(RM) $(INCLUDE_PATH)\zlib.h |
85 | for %%p in ($(LIBS)) do $(RM) $(LIBRARY_PATH)\%%p | 87 | $(RM) $(INCLUDE_PATH)\zconf.h |
88 | $(RM) $(LIBRARY_PATH)\libz.a | ||
86 | 89 | ||
87 | clean: | 90 | clean: |
88 | for %%p in (*.d *.o *.exe libz.a libz.so* foo.gz) do $(RM) %%p | 91 | $(RM) *.d |
92 | $(RM) *.o | ||
93 | $(RM) *.exe | ||
94 | $(RM) libz.a | ||
95 | $(RM) foo.gz | ||
89 | 96 | ||
90 | DEPS := $(wildcard *.d) | 97 | DEPS := $(wildcard *.d) |
91 | ifneq ($(DEPS),) | 98 | ifneq ($(DEPS),) |
diff --git a/Makefile.msc b/msdos/Makefile.msc index 112684a..1a6d663 100644 --- a/Makefile.msc +++ b/msdos/Makefile.msc | |||
@@ -15,7 +15,7 @@ CFLAGS=-Oait -Gs -nologo -W3 $(MODEL) | |||
15 | #-Ox generates bad code with MSC 5.1 | 15 | #-Ox generates bad code with MSC 5.1 |
16 | CC=cl | 16 | CC=cl |
17 | LD=link | 17 | LD=link |
18 | LDFLAGS=/e/st:0x1000/noe | 18 | LDFLAGS=/e/st:0x1500/noe |
19 | O=.obj | 19 | O=.obj |
20 | 20 | ||
21 | # variables | 21 | # variables |
diff --git a/Makefile.tc b/msdos/Makefile.tc index a46ce73..a46ce73 100644 --- a/Makefile.tc +++ b/msdos/Makefile.tc | |||
diff --git a/Makefile.wat b/msdos/Makefile.wat index 2a3b629..2a3b629 100644 --- a/Makefile.wat +++ b/msdos/Makefile.wat | |||
diff --git a/msdos/zlib.def b/msdos/zlib.def new file mode 100644 index 0000000..346cce7 --- /dev/null +++ b/msdos/zlib.def | |||
@@ -0,0 +1,57 @@ | |||
1 | LIBRARY "zlib" | ||
2 | |||
3 | DESCRIPTION '"""zlib data compression library"""' | ||
4 | |||
5 | EXETYPE NT | ||
6 | |||
7 | SUBSYSTEM WINDOWS | ||
8 | |||
9 | STUB 'WINSTUB.EXE' | ||
10 | |||
11 | VERSION 1.07 | ||
12 | |||
13 | CODE EXECUTE READ | ||
14 | |||
15 | DATA READ WRITE | ||
16 | |||
17 | HEAPSIZE 1048576,4096 | ||
18 | |||
19 | EXPORTS | ||
20 | adler32 @1 | ||
21 | compress @2 | ||
22 | crc32 @3 | ||
23 | deflate @4 | ||
24 | deflateCopy @5 | ||
25 | deflateEnd @6 | ||
26 | deflateInit2_ @7 | ||
27 | deflateInit_ @8 | ||
28 | deflateParams @9 | ||
29 | deflateReset @10 | ||
30 | deflateSetDictionary @11 | ||
31 | gzclose @12 | ||
32 | gzdopen @13 | ||
33 | gzerror @14 | ||
34 | gzflush @15 | ||
35 | gzopen @16 | ||
36 | gzread @17 | ||
37 | gzwrite @18 | ||
38 | inflate @19 | ||
39 | inflateEnd @20 | ||
40 | inflateInit2_ @21 | ||
41 | inflateInit_ @22 | ||
42 | inflateReset @23 | ||
43 | inflateSetDictionary @24 | ||
44 | inflateSync @25 | ||
45 | uncompress @26 | ||
46 | zlibVersion @27 | ||
47 | gzprintf @28 | ||
48 | gzputc @29 | ||
49 | gzgetc @30 | ||
50 | gzseek @31 | ||
51 | gzrewind @32 | ||
52 | gztell @33 | ||
53 | gzeof @34 | ||
54 | gzsetparams @35 | ||
55 | zError @36 | ||
56 | inflateSyncPoint @37 | ||
57 | get_crc_table @38 | ||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1,0,5,0 | 5 | FILEVERSION 1,0,7,0 |
6 | PRODUCTVERSION 1,0,5,0 | 6 | PRODUCTVERSION 1,0,7,0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,12 +17,12 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression library\0" | 19 | VALUE "FileDescription", "zlib data compression library\0" |
20 | VALUE "FileVersion", "1.0.5\0" | 20 | VALUE "FileVersion", "1.0.7\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlib.lib\0" | 22 | VALUE "OriginalFilename", "zlib.lib\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
24 | VALUE "Comments", "DLL support by Alessandro Iacopetti\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
25 | VALUE "LegalCopyright", "(C) 1995-1996 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-1998 Jean-loup Gailly & Mark Adler\0" |
26 | END | 26 | END |
27 | END | 27 | END |
28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |