diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:22:21 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:22:21 -0700 |
commit | 85e7d7d9ba71d95a9e6a64b98bae4fac09f06f1c (patch) | |
tree | 790235a70a5d719992f0bf84864e43a7a4ef376b /contrib/vstudio | |
parent | 8e34b3a8024c028dd9fd21d70525fc6d215efde5 (diff) | |
download | zlib-1.2.0.3.tar.gz zlib-1.2.0.3.tar.bz2 zlib-1.2.0.3.zip |
zlib 1.2.0.3v1.2.0.3
Diffstat (limited to 'contrib/vstudio')
-rw-r--r-- | contrib/vstudio/vc15_16/zlib16.mak | 13 | ||||
-rw-r--r-- | contrib/vstudio/vc70_32/miniunz.vcproj | 4 | ||||
-rw-r--r-- | contrib/vstudio/vc70_32/minizip.vcproj | 4 | ||||
-rw-r--r-- | contrib/vstudio/vc70_32/zlibstat.vcproj | 8 | ||||
-rw-r--r-- | contrib/vstudio/vc70_32/zlibvc.vcproj | 24 |
5 files changed, 35 insertions, 18 deletions
diff --git a/contrib/vstudio/vc15_16/zlib16.mak b/contrib/vstudio/vc15_16/zlib16.mak index 75c8d80..cb65885 100644 --- a/contrib/vstudio/vc15_16/zlib16.mak +++ b/contrib/vstudio/vc15_16/zlib16.mak | |||
@@ -22,8 +22,8 @@ CPPUSEPCHFLAG = | |||
22 | FIRSTC = ADLER32.C | 22 | FIRSTC = ADLER32.C |
23 | FIRSTCPP = | 23 | FIRSTCPP = |
24 | RC = rc | 24 | RC = rc |
25 | CFLAGS_D_WDLL = /nologo /G2 /W3 /Zi /ALw /Od /D "_DEBUG" /D "WINDOWS" /D "ZLIB_DLL" /FR /GD /Fd"ZLIB.PDB" | 25 | CFLAGS_D_WDLL = /nologo /G2 /W3 /Zi /ALw /Od /D "_DEBUG" /D "WINDOWS" /D "ZLIB_DLL" /D "ZLIB_INTERNAL" /FR /GD /Fd"ZLIB.PDB" |
26 | CFLAGS_R_WDLL = /nologo /W3 /ALw /O1 /D "NDEBUG" /D "WINDOWS" /D "ZLIB_DLL" /FR /GD | 26 | CFLAGS_R_WDLL = /nologo /W3 /ALw /O1 /D "NDEBUG" /D "WINDOWS" /D "ZLIB_DLL" /D "ZLIB_INTERNAL" /FR /GD |
27 | LFLAGS_D_WDLL = /NOLOGO /ONERROR:NOEXE /NOD /PACKC:61440 /CO /NOE /ALIGN:16 /MAP:FULL | 27 | LFLAGS_D_WDLL = /NOLOGO /ONERROR:NOEXE /NOD /PACKC:61440 /CO /NOE /ALIGN:16 /MAP:FULL |
28 | LFLAGS_R_WDLL = /NOLOGO /ONERROR:NOEXE /NOD /PACKC:61440 /NOE /ALIGN:16 /MAP:FULL | 28 | LFLAGS_R_WDLL = /NOLOGO /ONERROR:NOEXE /NOD /PACKC:61440 /NOE /ALIGN:16 /MAP:FULL |
29 | LIBS_D_WDLL = oldnames libw commdlg shell olecli olesvr ldllcew | 29 | LIBS_D_WDLL = oldnames libw commdlg shell olecli olesvr ldllcew |
@@ -74,7 +74,8 @@ COMPRESS_DEP = c:\zlib\zlib.h \ | |||
74 | c:\zlib\zconf.h | 74 | c:\zlib\zconf.h |
75 | 75 | ||
76 | 76 | ||
77 | CRC32_DEP = c:\zlib\zlib.h \ | 77 | CRC32_DEP = c:\zlib\zutil.h \ |
78 | c:\zlib\zlib.h \ | ||
78 | c:\zlib\zconf.h \ | 79 | c:\zlib\zconf.h \ |
79 | c:\zlib\crc32.h | 80 | c:\zlib\crc32.h |
80 | 81 | ||
@@ -128,13 +129,15 @@ ZLIB16_RCDEP = | |||
128 | ZIP_DEP = c:\zlib\zlib.h \ | 129 | ZIP_DEP = c:\zlib\zlib.h \ |
129 | c:\zlib\zconf.h \ | 130 | c:\zlib\zconf.h \ |
130 | c:\zlib\zip.h \ | 131 | c:\zlib\zip.h \ |
131 | c:\zlib\ioapi.h | 132 | c:\zlib\ioapi.h \ |
133 | c:\zlib\crypt.h | ||
132 | 134 | ||
133 | 135 | ||
134 | UNZIP_DEP = c:\zlib\zlib.h \ | 136 | UNZIP_DEP = c:\zlib\zlib.h \ |
135 | c:\zlib\zconf.h \ | 137 | c:\zlib\zconf.h \ |
136 | c:\zlib\unzip.h \ | 138 | c:\zlib\unzip.h \ |
137 | c:\zlib\ioapi.h | 139 | c:\zlib\ioapi.h \ |
140 | c:\zlib\crypt.h | ||
138 | 141 | ||
139 | 142 | ||
140 | INFBACK_DEP = c:\zlib\zutil.h \ | 143 | INFBACK_DEP = c:\zlib\zutil.h \ |
diff --git a/contrib/vstudio/vc70_32/miniunz.vcproj b/contrib/vstudio/vc70_32/miniunz.vcproj index 56f0da3..1c6967f 100644 --- a/contrib/vstudio/vc70_32/miniunz.vcproj +++ b/contrib/vstudio/vc70_32/miniunz.vcproj | |||
@@ -19,7 +19,7 @@ | |||
19 | <Tool | 19 | <Tool |
20 | Name="VCCLCompilerTool" | 20 | Name="VCCLCompilerTool" |
21 | Optimization="0" | 21 | Optimization="0" |
22 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | 22 | PreprocessorDefinitions="WIN32;ZLIB_DLL;_DEBUG;_CONSOLE" |
23 | MinimalRebuild="TRUE" | 23 | MinimalRebuild="TRUE" |
24 | BasicRuntimeChecks="3" | 24 | BasicRuntimeChecks="3" |
25 | RuntimeLibrary="5" | 25 | RuntimeLibrary="5" |
@@ -63,7 +63,7 @@ | |||
63 | Optimization="2" | 63 | Optimization="2" |
64 | InlineFunctionExpansion="1" | 64 | InlineFunctionExpansion="1" |
65 | OmitFramePointers="TRUE" | 65 | OmitFramePointers="TRUE" |
66 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | 66 | PreprocessorDefinitions="WIN32;ZLIB_DLL;NDEBUG;_CONSOLE" |
67 | StringPooling="TRUE" | 67 | StringPooling="TRUE" |
68 | RuntimeLibrary="4" | 68 | RuntimeLibrary="4" |
69 | EnableFunctionLevelLinking="TRUE" | 69 | EnableFunctionLevelLinking="TRUE" |
diff --git a/contrib/vstudio/vc70_32/minizip.vcproj b/contrib/vstudio/vc70_32/minizip.vcproj index 2cc5aca..93e2a41 100644 --- a/contrib/vstudio/vc70_32/minizip.vcproj +++ b/contrib/vstudio/vc70_32/minizip.vcproj | |||
@@ -19,7 +19,7 @@ | |||
19 | <Tool | 19 | <Tool |
20 | Name="VCCLCompilerTool" | 20 | Name="VCCLCompilerTool" |
21 | Optimization="0" | 21 | Optimization="0" |
22 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | 22 | PreprocessorDefinitions="WIN32;ZLIB_DLL;_DEBUG;_CONSOLE" |
23 | MinimalRebuild="TRUE" | 23 | MinimalRebuild="TRUE" |
24 | BasicRuntimeChecks="3" | 24 | BasicRuntimeChecks="3" |
25 | RuntimeLibrary="5" | 25 | RuntimeLibrary="5" |
@@ -63,7 +63,7 @@ | |||
63 | Optimization="2" | 63 | Optimization="2" |
64 | InlineFunctionExpansion="1" | 64 | InlineFunctionExpansion="1" |
65 | OmitFramePointers="TRUE" | 65 | OmitFramePointers="TRUE" |
66 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | 66 | PreprocessorDefinitions="WIN32;ZLIB_DLL;NDEBUG;_CONSOLE" |
67 | StringPooling="TRUE" | 67 | StringPooling="TRUE" |
68 | RuntimeLibrary="4" | 68 | RuntimeLibrary="4" |
69 | EnableFunctionLevelLinking="TRUE" | 69 | EnableFunctionLevelLinking="TRUE" |
diff --git a/contrib/vstudio/vc70_32/zlibstat.vcproj b/contrib/vstudio/vc70_32/zlibstat.vcproj index 94d4a63..7470b58 100644 --- a/contrib/vstudio/vc70_32/zlibstat.vcproj +++ b/contrib/vstudio/vc70_32/zlibstat.vcproj | |||
@@ -20,7 +20,7 @@ | |||
20 | <Tool | 20 | <Tool |
21 | Name="VCCLCompilerTool" | 21 | Name="VCCLCompilerTool" |
22 | Optimization="0" | 22 | Optimization="0" |
23 | PreprocessorDefinitions="WIN32" | 23 | PreprocessorDefinitions="WIN32;ZLIB_DLL" |
24 | ExceptionHandling="FALSE" | 24 | ExceptionHandling="FALSE" |
25 | RuntimeLibrary="5" | 25 | RuntimeLibrary="5" |
26 | PrecompiledHeaderFile=".\zlibstatDebug/zlibstat.pch" | 26 | PrecompiledHeaderFile=".\zlibstatDebug/zlibstat.pch" |
@@ -61,7 +61,7 @@ | |||
61 | <Tool | 61 | <Tool |
62 | Name="VCCLCompilerTool" | 62 | Name="VCCLCompilerTool" |
63 | InlineFunctionExpansion="1" | 63 | InlineFunctionExpansion="1" |
64 | PreprocessorDefinitions="WIN32" | 64 | PreprocessorDefinitions="WIN32;ZLIB_DLL" |
65 | StringPooling="TRUE" | 65 | StringPooling="TRUE" |
66 | ExceptionHandling="FALSE" | 66 | ExceptionHandling="FALSE" |
67 | RuntimeLibrary="4" | 67 | RuntimeLibrary="4" |
@@ -102,7 +102,7 @@ | |||
102 | <Tool | 102 | <Tool |
103 | Name="VCCLCompilerTool" | 103 | Name="VCCLCompilerTool" |
104 | InlineFunctionExpansion="1" | 104 | InlineFunctionExpansion="1" |
105 | PreprocessorDefinitions="WIN32,ASMV" | 105 | PreprocessorDefinitions="WIN32;ZLIB_DLL,ASMV" |
106 | StringPooling="TRUE" | 106 | StringPooling="TRUE" |
107 | ExceptionHandling="FALSE" | 107 | ExceptionHandling="FALSE" |
108 | RuntimeLibrary="4" | 108 | RuntimeLibrary="4" |
@@ -144,7 +144,7 @@ | |||
144 | <Tool | 144 | <Tool |
145 | Name="VCCLCompilerTool" | 145 | Name="VCCLCompilerTool" |
146 | InlineFunctionExpansion="1" | 146 | InlineFunctionExpansion="1" |
147 | PreprocessorDefinitions="WIN32" | 147 | PreprocessorDefinitions="WIN32;ZLIB_DLL" |
148 | StringPooling="TRUE" | 148 | StringPooling="TRUE" |
149 | ExceptionHandling="FALSE" | 149 | ExceptionHandling="FALSE" |
150 | RuntimeLibrary="4" | 150 | RuntimeLibrary="4" |
diff --git a/contrib/vstudio/vc70_32/zlibvc.vcproj b/contrib/vstudio/vc70_32/zlibvc.vcproj index fcf9892..7a9e83a 100644 --- a/contrib/vstudio/vc70_32/zlibvc.vcproj +++ b/contrib/vstudio/vc70_32/zlibvc.vcproj | |||
@@ -20,7 +20,7 @@ | |||
20 | <Tool | 20 | <Tool |
21 | Name="VCCLCompilerTool" | 21 | Name="VCCLCompilerTool" |
22 | Optimization="0" | 22 | Optimization="0" |
23 | PreprocessorDefinitions="WIN32,ASMV" | 23 | PreprocessorDefinitions="WIN32,ZLIB_DLL,ASMV" |
24 | ExceptionHandling="FALSE" | 24 | ExceptionHandling="FALSE" |
25 | RuntimeLibrary="1" | 25 | RuntimeLibrary="1" |
26 | PrecompiledHeaderFile=".\DebugDll/zlibvc.pch" | 26 | PrecompiledHeaderFile=".\DebugDll/zlibvc.pch" |
@@ -76,7 +76,7 @@ | |||
76 | <Tool | 76 | <Tool |
77 | Name="VCCLCompilerTool" | 77 | Name="VCCLCompilerTool" |
78 | InlineFunctionExpansion="1" | 78 | InlineFunctionExpansion="1" |
79 | PreprocessorDefinitions="WIN32" | 79 | PreprocessorDefinitions="WIN32,ZLIB_DLL" |
80 | StringPooling="TRUE" | 80 | StringPooling="TRUE" |
81 | ExceptionHandling="FALSE" | 81 | ExceptionHandling="FALSE" |
82 | RuntimeLibrary="0" | 82 | RuntimeLibrary="0" |
@@ -138,7 +138,7 @@ | |||
138 | <Tool | 138 | <Tool |
139 | Name="VCCLCompilerTool" | 139 | Name="VCCLCompilerTool" |
140 | InlineFunctionExpansion="1" | 140 | InlineFunctionExpansion="1" |
141 | PreprocessorDefinitions="WIN32,ASMV" | 141 | PreprocessorDefinitions="WIN32,ZLIB_DLL,ASMV" |
142 | StringPooling="TRUE" | 142 | StringPooling="TRUE" |
143 | ExceptionHandling="FALSE" | 143 | ExceptionHandling="FALSE" |
144 | RuntimeLibrary="0" | 144 | RuntimeLibrary="0" |
@@ -200,7 +200,7 @@ | |||
200 | <Tool | 200 | <Tool |
201 | Name="VCCLCompilerTool" | 201 | Name="VCCLCompilerTool" |
202 | InlineFunctionExpansion="1" | 202 | InlineFunctionExpansion="1" |
203 | PreprocessorDefinitions="WIN32" | 203 | PreprocessorDefinitions="WIN32,ZLIB_DLL" |
204 | StringPooling="TRUE" | 204 | StringPooling="TRUE" |
205 | ExceptionHandling="FALSE" | 205 | ExceptionHandling="FALSE" |
206 | RuntimeLibrary="0" | 206 | RuntimeLibrary="0" |
@@ -260,7 +260,7 @@ | |||
260 | <Tool | 260 | <Tool |
261 | Name="VCCLCompilerTool" | 261 | Name="VCCLCompilerTool" |
262 | InlineFunctionExpansion="1" | 262 | InlineFunctionExpansion="1" |
263 | PreprocessorDefinitions="WIN32,ASMV" | 263 | PreprocessorDefinitions="WIN32,ZLIB_DLL,ASMV" |
264 | StringPooling="TRUE" | 264 | StringPooling="TRUE" |
265 | ExceptionHandling="FALSE" | 265 | ExceptionHandling="FALSE" |
266 | RuntimeLibrary="0" | 266 | RuntimeLibrary="0" |
@@ -379,9 +379,23 @@ | |||
379 | </File> | 379 | </File> |
380 | <File | 380 | <File |
381 | RelativePath=".\unzip.c"> | 381 | RelativePath=".\unzip.c"> |
382 | <FileConfiguration | ||
383 | Name="Release|Win32"> | ||
384 | <Tool | ||
385 | Name="VCCLCompilerTool" | ||
386 | AdditionalIncludeDirectories="" | ||
387 | PreprocessorDefinitions="ZLIB_INTERNAL"/> | ||
388 | </FileConfiguration> | ||
382 | </File> | 389 | </File> |
383 | <File | 390 | <File |
384 | RelativePath=".\zip.c"> | 391 | RelativePath=".\zip.c"> |
392 | <FileConfiguration | ||
393 | Name="Release|Win32"> | ||
394 | <Tool | ||
395 | Name="VCCLCompilerTool" | ||
396 | AdditionalIncludeDirectories="" | ||
397 | PreprocessorDefinitions="ZLIB_INTERNAL"/> | ||
398 | </FileConfiguration> | ||
385 | </File> | 399 | </File> |
386 | <File | 400 | <File |
387 | RelativePath=".\zlib.rc"> | 401 | RelativePath=".\zlib.rc"> |