summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2023-08-19 10:43:36 -0700
committerMark Adler <madler@alumni.caltech.edu>2023-08-19 10:43:36 -0700
commit4c5a81c2ae5c96fc5f3f7d4baf5aedee062f6f09 (patch)
treea1cb49f15be7b4dae9812d416eb5a8a5289d3610
parent0f68a0d89d8dd4edb444cc1a4219a44c17524820 (diff)
downloadzlib-4c5a81c2ae5c96fc5f3f7d4baf5aedee062f6f09.tar.gz
zlib-4c5a81c2ae5c96fc5f3f7d4baf5aedee062f6f09.tar.bz2
zlib-4c5a81c2ae5c96fc5f3f7d4baf5aedee062f6f09.zip
Remove carriage returns from contrib/vstudio/readme.txt.
-rw-r--r--contrib/vstudio/readme.txt150
1 files changed, 75 insertions, 75 deletions
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index a21f045..873798f 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,75 +1,75 @@
1Building instructions for the DLL versions of Zlib 1.3.0.1 1Building instructions for the DLL versions of Zlib 1.3.0.1
2======================================================== 2========================================================
3 3
4This directory contains projects that build zlib and minizip using 4This directory contains projects that build zlib and minizip using
5Microsoft Visual C++ 9.0/10.0. 5Microsoft Visual C++ 9.0/10.0.
6 6
7You don't need to build these projects yourself. You can download the 7You don't need to build these projects yourself. You can download the
8binaries from: 8binaries from:
9 http://www.winimage.com/zLibDll 9 http://www.winimage.com/zLibDll
10 10
11More information can be found at this site. 11More information can be found at this site.
12 12
13 13
14 14
15 15
16 16
17Build instructions for Visual Studio 2008 (32 bits or 64 bits) 17Build instructions for Visual Studio 2008 (32 bits or 64 bits)
18-------------------------------------------------------------- 18--------------------------------------------------------------
19- Decompress current zlib, including all contrib/* files 19- Decompress current zlib, including all contrib/* files
20- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008 20- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
21- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32" 21- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
22 22
23Build instructions for Visual Studio 2010 (32 bits or 64 bits) 23Build instructions for Visual Studio 2010 (32 bits or 64 bits)
24-------------------------------------------------------------- 24--------------------------------------------------------------
25- Decompress current zlib, including all contrib/* files 25- Decompress current zlib, including all contrib/* files
26- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010 26- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
27 27
28Build instructions for Visual Studio 2012 (32 bits or 64 bits) 28Build instructions for Visual Studio 2012 (32 bits or 64 bits)
29-------------------------------------------------------------- 29--------------------------------------------------------------
30- Decompress current zlib, including all contrib/* files 30- Decompress current zlib, including all contrib/* files
31- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012 31- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
32 32
33Build instructions for Visual Studio 2013 (32 bits or 64 bits) 33Build instructions for Visual Studio 2013 (32 bits or 64 bits)
34-------------------------------------------------------------- 34--------------------------------------------------------------
35- Decompress current zlib, including all contrib/* files 35- Decompress current zlib, including all contrib/* files
36- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013 36- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
37 37
38Build instructions for Visual Studio 2015 (32 bits or 64 bits) 38Build instructions for Visual Studio 2015 (32 bits or 64 bits)
39-------------------------------------------------------------- 39--------------------------------------------------------------
40- Decompress current zlib, including all contrib/* files 40- Decompress current zlib, including all contrib/* files
41- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015 41- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
42 42
43 43
44Important 44Important
45--------- 45---------
46- To use zlibwapi.dll in your application, you must define the 46- To use zlibwapi.dll in your application, you must define the
47 macro ZLIB_WINAPI when compiling your application's source files. 47 macro ZLIB_WINAPI when compiling your application's source files.
48 48
49 49
50Additional notes 50Additional notes
51---------------- 51----------------
52- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built 52- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
53 by Gilles Vollant from the zlib 1.1.x sources, and distributed at 53 by Gilles Vollant from the zlib 1.1.x sources, and distributed at
54 http://www.winimage.com/zLibDll 54 http://www.winimage.com/zLibDll
55 It uses the WINAPI calling convention for the exported functions, and 55 It uses the WINAPI calling convention for the exported functions, and
56 includes the minizip functionality. If your application needs that 56 includes the minizip functionality. If your application needs that
57 particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll. 57 particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
58 58
59- The new DLL was renamed because there exist several incompatible 59- The new DLL was renamed because there exist several incompatible
60 versions of zlib.dll on the Internet. 60 versions of zlib.dll on the Internet.
61 61
62- There is also an official DLL build of zlib, named zlib1.dll. This one 62- There is also an official DLL build of zlib, named zlib1.dll. This one
63 is exporting the functions using the CDECL convention. See the file 63 is exporting the functions using the CDECL convention. See the file
64 win32\DLL_FAQ.txt found in this zlib distribution. 64 win32\DLL_FAQ.txt found in this zlib distribution.
65 65
66- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol 66- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
67 has a slightly different effect. To avoid compatibility problems, do 67 has a slightly different effect. To avoid compatibility problems, do
68 not define it here. 68 not define it here.
69 69
70 70
71Gilles Vollant 71Gilles Vollant
72info@winimage.com 72info@winimage.com
73 73
74Visual Studio 2013 and 2015 Projects from Sean Hunt 74Visual Studio 2013 and 2015 Projects from Sean Hunt
75seandhunt_7@yahoo.com 75seandhunt_7@yahoo.com