summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--win32/DLL_FAQ.txt12
-rw-r--r--win32/VisualC.txt3
-rw-r--r--win32/zlib1.rc8
3 files changed, 12 insertions, 11 deletions
diff --git a/win32/DLL_FAQ.txt b/win32/DLL_FAQ.txt
index a3ed5dd..1746a95 100644
--- a/win32/DLL_FAQ.txt
+++ b/win32/DLL_FAQ.txt
@@ -175,7 +175,7 @@ in the zlib distribution, or at the following location:
175 zlib in other programming languages. Some of them, like Ada 175 zlib in other programming languages. Some of them, like Ada
176 (GNAT) and Fortran (GNU G77), have C bindings implemented 176 (GNAT) and Fortran (GNU G77), have C bindings implemented
177 initially on Unix, and relying on the C calling convention. 177 initially on Unix, and relying on the C calling convention.
178 On the other hand, the pre- .NET versions of Microsoft Visual 178 On the other hand, the pre- .Net versions of Microsoft Visual
179 Basic require STDCALL, while Borland Delphi prefers, although 179 Basic require STDCALL, while Borland Delphi prefers, although
180 it does not require, FASTCALL. 180 it does not require, FASTCALL.
181 181
@@ -203,13 +203,11 @@ in the zlib distribution, or at the following location:
203 zlib distribution. 203 zlib distribution.
204 204
205 205
206 8. I need a DLL for my Microsoft .NET project. What can I do? 206 8. I need to use zlib in my Microsoft .Net project. What can I
207 do?
207 208
208 - We did not implement a COM wrapper around zlib, so you will 209 - Henrik Ravn has contributed a .Net wrapper around zlib. Look
209 have to develop it yourself, or to get it from somewhere else. 210 into contrib/dotzlib/, inside the zlib distribution.
210
211 If you would be so generous as to contribute such a wrapper,
212 we would like to include it in a future zlib version.
213 211
214 212
215 9. If my application uses ZLIB1.DLL, should I link it to 213 9. If my application uses ZLIB1.DLL, should I link it to
diff --git a/win32/VisualC.txt b/win32/VisualC.txt
new file mode 100644
index 0000000..579a5fc
--- /dev/null
+++ b/win32/VisualC.txt
@@ -0,0 +1,3 @@
1
2To build zlib using the Microsoft Visual C++ environment,
3use the appropriate project from the projects/ directory.
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index 130493a..162ab8f 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
5#else 5#else
6VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 6VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
7#endif 7#endif
8 FILEVERSION 1,2,1,2 8 FILEVERSION 1,2,2
9 PRODUCTVERSION 1,2,1,2 9 PRODUCTVERSION 1,2,2
10 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 10 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
11#ifdef _DEBUG 11#ifdef _DEBUG
12 FILEFLAGS 1 12 FILEFLAGS 1
@@ -23,12 +23,12 @@ BEGIN
23 //language ID = U.S. English, char set = Windows, Multilingual 23 //language ID = U.S. English, char set = Windows, Multilingual
24 BEGIN 24 BEGIN
25 VALUE "FileDescription", "zlib data compression library\0" 25 VALUE "FileDescription", "zlib data compression library\0"
26 VALUE "FileVersion", "1.2.1.2\0" 26 VALUE "FileVersion", "1.2.2\0"
27 VALUE "InternalName", "zlib1.dll\0" 27 VALUE "InternalName", "zlib1.dll\0"
28 VALUE "LegalCopyright", "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0" 28 VALUE "LegalCopyright", "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
29 VALUE "OriginalFilename", "zlib1.dll\0" 29 VALUE "OriginalFilename", "zlib1.dll\0"
30 VALUE "ProductName", "zlib\0" 30 VALUE "ProductName", "zlib\0"
31 VALUE "ProductVersion", "1.2.1.2\0" 31 VALUE "ProductVersion", "1.2.2\0"
32 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 32 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
33 END 33 END
34 END 34 END