summaryrefslogtreecommitdiff
path: root/contrib/vstudio/vc9
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:27:26 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:27:26 -0700
commit7751bd4c715ea8478113e34b49b5a794a4642e8e (patch)
tree537ba82b3780f933c2f17028febd6fe3a2332190 /contrib/vstudio/vc9
parente0ff940e1adb68d3575705ebf1546d9f07ad3b4a (diff)
downloadzlib-1.2.3.9.tar.gz
zlib-1.2.3.9.tar.bz2
zlib-1.2.3.9.zip
zlib 1.2.3.9v1.2.3.9
Diffstat (limited to '')
-rw-r--r--contrib/vstudio/vc9/miniunz.vcproj (renamed from contrib/vstudio/vc8/miniunz.vcproj)81
-rw-r--r--contrib/vstudio/vc9/minizip.vcproj (renamed from contrib/vstudio/vc8/minizip.vcproj)83
-rw-r--r--contrib/vstudio/vc9/testzlib.vcproj (renamed from contrib/vstudio/vc8/testzlib.vcproj)190
-rw-r--r--contrib/vstudio/vc9/testzlibdll.vcproj (renamed from contrib/vstudio/vc8/testzlibdll.vcproj)82
-rw-r--r--contrib/vstudio/vc9/zlib.rc (renamed from contrib/vstudio/vc7/zlib.rc)8
-rw-r--r--contrib/vstudio/vc9/zlibstat.vcproj (renamed from contrib/vstudio/vc8/zlibstat.vcproj)138
-rw-r--r--contrib/vstudio/vc9/zlibvc.def (renamed from contrib/contrib/vstudio/vc8/zlibvc.def)19
-rw-r--r--contrib/vstudio/vc9/zlibvc.sln (renamed from contrib/vstudio/vc8/zlibvc.sln)4
-rw-r--r--contrib/vstudio/vc9/zlibvc.vcproj (renamed from contrib/contrib/vstudio/vc8/zlibvc.vcproj)201
9 files changed, 414 insertions, 392 deletions
diff --git a/contrib/vstudio/vc8/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj
index 4af53e8..7da32b9 100644
--- a/contrib/vstudio/vc8/miniunz.vcproj
+++ b/contrib/vstudio/vc9/miniunz.vcproj
@@ -1,10 +1,11 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="9.00"
5 Name="miniunz" 5 Name="miniunz"
6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}" 6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 TargetFrameworkVersion="131072"
8 > 9 >
9 <Platforms> 10 <Platforms>
10 <Platform 11 <Platform
@@ -76,6 +77,8 @@
76 GenerateDebugInformation="true" 77 GenerateDebugInformation="true"
77 ProgramDatabaseFile="$(OutDir)/miniunz.pdb" 78 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
78 SubSystem="1" 79 SubSystem="1"
80 RandomizedBaseAddress="1"
81 DataExecutionPrevention="0"
79 TargetMachine="1" 82 TargetMachine="1"
80 /> 83 />
81 <Tool 84 <Tool
@@ -97,16 +100,13 @@
97 Name="VCAppVerifierTool" 100 Name="VCAppVerifierTool"
98 /> 101 />
99 <Tool 102 <Tool
100 Name="VCWebDeploymentTool"
101 />
102 <Tool
103 Name="VCPostBuildEventTool" 103 Name="VCPostBuildEventTool"
104 /> 104 />
105 </Configuration> 105 </Configuration>
106 <Configuration 106 <Configuration
107 Name="Debug|x64" 107 Name="Release|Win32"
108 OutputDirectory="x64\MiniUnzip$(ConfigurationName)" 108 OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
109 IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp" 109 IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
110 ConfigurationType="1" 110 ConfigurationType="1"
111 InheritedPropertySheets="UpgradeFromVC70.vsprops" 111 InheritedPropertySheets="UpgradeFromVC70.vsprops"
112 CharacterSet="2" 112 CharacterSet="2"
@@ -125,17 +125,19 @@
125 /> 125 />
126 <Tool 126 <Tool
127 Name="VCMIDLTool" 127 Name="VCMIDLTool"
128 TargetEnvironment="3"
129 /> 128 />
130 <Tool 129 <Tool
131 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
132 Optimization="0" 131 Optimization="2"
132 InlineFunctionExpansion="1"
133 OmitFramePointers="true"
133 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
134 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" 135 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
135 MinimalRebuild="true" 136 StringPooling="true"
136 BasicRuntimeChecks="0" 137 BasicRuntimeChecks="0"
137 RuntimeLibrary="3" 138 RuntimeLibrary="0"
138 BufferSecurityCheck="false" 139 BufferSecurityCheck="false"
140 EnableFunctionLevelLinking="true"
139 UsePrecompiledHeader="0" 141 UsePrecompiledHeader="0"
140 AssemblerListingLocation="$(IntDir)\" 142 AssemblerListingLocation="$(IntDir)\"
141 WarningLevel="3" 143 WarningLevel="3"
@@ -153,14 +155,18 @@
153 /> 155 />
154 <Tool 156 <Tool
155 Name="VCLinkerTool" 157 Name="VCLinkerTool"
156 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" 158 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
157 OutputFile="$(OutDir)/miniunz.exe" 159 OutputFile="$(OutDir)/miniunz.exe"
158 LinkIncremental="2" 160 LinkIncremental="1"
159 GenerateManifest="false" 161 GenerateManifest="false"
160 GenerateDebugInformation="true" 162 GenerateDebugInformation="true"
161 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
162 SubSystem="1" 163 SubSystem="1"
163 TargetMachine="17" 164 OptimizeReferences="2"
165 EnableCOMDATFolding="2"
166 OptimizeForWindows98="1"
167 RandomizedBaseAddress="1"
168 DataExecutionPrevention="0"
169 TargetMachine="1"
164 /> 170 />
165 <Tool 171 <Tool
166 Name="VCALinkTool" 172 Name="VCALinkTool"
@@ -181,16 +187,13 @@
181 Name="VCAppVerifierTool" 187 Name="VCAppVerifierTool"
182 /> 188 />
183 <Tool 189 <Tool
184 Name="VCWebDeploymentTool"
185 />
186 <Tool
187 Name="VCPostBuildEventTool" 190 Name="VCPostBuildEventTool"
188 /> 191 />
189 </Configuration> 192 </Configuration>
190 <Configuration 193 <Configuration
191 Name="Debug|Itanium" 194 Name="Debug|x64"
192 OutputDirectory="ia64\MiniUnzip$(ConfigurationName)" 195 OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
193 IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp" 196 IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
194 ConfigurationType="1" 197 ConfigurationType="1"
195 InheritedPropertySheets="UpgradeFromVC70.vsprops" 198 InheritedPropertySheets="UpgradeFromVC70.vsprops"
196 CharacterSet="2" 199 CharacterSet="2"
@@ -209,7 +212,7 @@
209 /> 212 />
210 <Tool 213 <Tool
211 Name="VCMIDLTool" 214 Name="VCMIDLTool"
212 TargetEnvironment="2" 215 TargetEnvironment="3"
213 /> 216 />
214 <Tool 217 <Tool
215 Name="VCCLCompilerTool" 218 Name="VCCLCompilerTool"
@@ -237,14 +240,14 @@
237 /> 240 />
238 <Tool 241 <Tool
239 Name="VCLinkerTool" 242 Name="VCLinkerTool"
240 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" 243 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
241 OutputFile="$(OutDir)/miniunz.exe" 244 OutputFile="$(OutDir)/miniunz.exe"
242 LinkIncremental="2" 245 LinkIncremental="2"
243 GenerateManifest="false" 246 GenerateManifest="false"
244 GenerateDebugInformation="true" 247 GenerateDebugInformation="true"
245 ProgramDatabaseFile="$(OutDir)/miniunz.pdb" 248 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
246 SubSystem="1" 249 SubSystem="1"
247 TargetMachine="5" 250 TargetMachine="17"
248 /> 251 />
249 <Tool 252 <Tool
250 Name="VCALinkTool" 253 Name="VCALinkTool"
@@ -272,9 +275,9 @@
272 /> 275 />
273 </Configuration> 276 </Configuration>
274 <Configuration 277 <Configuration
275 Name="Release|Win32" 278 Name="Debug|Itanium"
276 OutputDirectory="x86\MiniUnzip$(ConfigurationName)" 279 OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
277 IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp" 280 IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
278 ConfigurationType="1" 281 ConfigurationType="1"
279 InheritedPropertySheets="UpgradeFromVC70.vsprops" 282 InheritedPropertySheets="UpgradeFromVC70.vsprops"
280 CharacterSet="2" 283 CharacterSet="2"
@@ -293,19 +296,17 @@
293 /> 296 />
294 <Tool 297 <Tool
295 Name="VCMIDLTool" 298 Name="VCMIDLTool"
299 TargetEnvironment="2"
296 /> 300 />
297 <Tool 301 <Tool
298 Name="VCCLCompilerTool" 302 Name="VCCLCompilerTool"
299 Optimization="2" 303 Optimization="0"
300 InlineFunctionExpansion="1"
301 OmitFramePointers="true"
302 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 304 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
303 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" 305 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
304 StringPooling="true" 306 MinimalRebuild="true"
305 BasicRuntimeChecks="0" 307 BasicRuntimeChecks="0"
306 RuntimeLibrary="0" 308 RuntimeLibrary="3"
307 BufferSecurityCheck="false" 309 BufferSecurityCheck="false"
308 EnableFunctionLevelLinking="true"
309 UsePrecompiledHeader="0" 310 UsePrecompiledHeader="0"
310 AssemblerListingLocation="$(IntDir)\" 311 AssemblerListingLocation="$(IntDir)\"
311 WarningLevel="3" 312 WarningLevel="3"
@@ -323,16 +324,14 @@
323 /> 324 />
324 <Tool 325 <Tool
325 Name="VCLinkerTool" 326 Name="VCLinkerTool"
326 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" 327 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
327 OutputFile="$(OutDir)/miniunz.exe" 328 OutputFile="$(OutDir)/miniunz.exe"
328 LinkIncremental="1" 329 LinkIncremental="2"
329 GenerateManifest="false" 330 GenerateManifest="false"
330 GenerateDebugInformation="true" 331 GenerateDebugInformation="true"
332 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
331 SubSystem="1" 333 SubSystem="1"
332 OptimizeReferences="2" 334 TargetMachine="5"
333 EnableCOMDATFolding="2"
334 OptimizeForWindows98="1"
335 TargetMachine="1"
336 /> 335 />
337 <Tool 336 <Tool
338 Name="VCALinkTool" 337 Name="VCALinkTool"
diff --git a/contrib/vstudio/vc8/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj
index 85f64c4..e57e07d 100644
--- a/contrib/vstudio/vc8/minizip.vcproj
+++ b/contrib/vstudio/vc9/minizip.vcproj
@@ -1,10 +1,11 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="9.00"
5 Name="minizip" 5 Name="minizip"
6 ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" 6 ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 TargetFrameworkVersion="131072"
8 > 9 >
9 <Platforms> 10 <Platforms>
10 <Platform 11 <Platform
@@ -76,6 +77,8 @@
76 GenerateDebugInformation="true" 77 GenerateDebugInformation="true"
77 ProgramDatabaseFile="$(OutDir)/minizip.pdb" 78 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
78 SubSystem="1" 79 SubSystem="1"
80 RandomizedBaseAddress="1"
81 DataExecutionPrevention="0"
79 TargetMachine="1" 82 TargetMachine="1"
80 /> 83 />
81 <Tool 84 <Tool
@@ -97,16 +100,13 @@
97 Name="VCAppVerifierTool" 100 Name="VCAppVerifierTool"
98 /> 101 />
99 <Tool 102 <Tool
100 Name="VCWebDeploymentTool"
101 />
102 <Tool
103 Name="VCPostBuildEventTool" 103 Name="VCPostBuildEventTool"
104 /> 104 />
105 </Configuration> 105 </Configuration>
106 <Configuration 106 <Configuration
107 Name="Debug|x64" 107 Name="Release|Win32"
108 OutputDirectory="x64\$(ConfigurationName)" 108 OutputDirectory="x86\MiniZip$(ConfigurationName)"
109 IntermediateDirectory="x64\$(ConfigurationName)" 109 IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
110 ConfigurationType="1" 110 ConfigurationType="1"
111 InheritedPropertySheets="UpgradeFromVC70.vsprops" 111 InheritedPropertySheets="UpgradeFromVC70.vsprops"
112 CharacterSet="2" 112 CharacterSet="2"
@@ -125,17 +125,19 @@
125 /> 125 />
126 <Tool 126 <Tool
127 Name="VCMIDLTool" 127 Name="VCMIDLTool"
128 TargetEnvironment="3"
129 /> 128 />
130 <Tool 129 <Tool
131 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
132 Optimization="0" 131 Optimization="2"
132 InlineFunctionExpansion="1"
133 OmitFramePointers="true"
133 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
134 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" 135 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
135 MinimalRebuild="true" 136 StringPooling="true"
136 BasicRuntimeChecks="0" 137 BasicRuntimeChecks="0"
137 RuntimeLibrary="3" 138 RuntimeLibrary="0"
138 BufferSecurityCheck="false" 139 BufferSecurityCheck="false"
140 EnableFunctionLevelLinking="true"
139 UsePrecompiledHeader="0" 141 UsePrecompiledHeader="0"
140 AssemblerListingLocation="$(IntDir)\" 142 AssemblerListingLocation="$(IntDir)\"
141 WarningLevel="3" 143 WarningLevel="3"
@@ -153,14 +155,17 @@
153 /> 155 />
154 <Tool 156 <Tool
155 Name="VCLinkerTool" 157 Name="VCLinkerTool"
156 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" 158 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
157 OutputFile="$(OutDir)/minizip.exe" 159 OutputFile="$(OutDir)/minizip.exe"
158 LinkIncremental="2" 160 LinkIncremental="1"
159 GenerateManifest="false"
160 GenerateDebugInformation="true" 161 GenerateDebugInformation="true"
161 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
162 SubSystem="1" 162 SubSystem="1"
163 TargetMachine="17" 163 OptimizeReferences="2"
164 EnableCOMDATFolding="2"
165 OptimizeForWindows98="1"
166 RandomizedBaseAddress="1"
167 DataExecutionPrevention="0"
168 TargetMachine="1"
164 /> 169 />
165 <Tool 170 <Tool
166 Name="VCALinkTool" 171 Name="VCALinkTool"
@@ -181,16 +186,13 @@
181 Name="VCAppVerifierTool" 186 Name="VCAppVerifierTool"
182 /> 187 />
183 <Tool 188 <Tool
184 Name="VCWebDeploymentTool"
185 />
186 <Tool
187 Name="VCPostBuildEventTool" 189 Name="VCPostBuildEventTool"
188 /> 190 />
189 </Configuration> 191 </Configuration>
190 <Configuration 192 <Configuration
191 Name="Debug|Itanium" 193 Name="Debug|x64"
192 OutputDirectory="ia64\$(ConfigurationName)" 194 OutputDirectory="x64\$(ConfigurationName)"
193 IntermediateDirectory="ia64\$(ConfigurationName)" 195 IntermediateDirectory="x64\$(ConfigurationName)"
194 ConfigurationType="1" 196 ConfigurationType="1"
195 InheritedPropertySheets="UpgradeFromVC70.vsprops" 197 InheritedPropertySheets="UpgradeFromVC70.vsprops"
196 CharacterSet="2" 198 CharacterSet="2"
@@ -209,7 +211,7 @@
209 /> 211 />
210 <Tool 212 <Tool
211 Name="VCMIDLTool" 213 Name="VCMIDLTool"
212 TargetEnvironment="2" 214 TargetEnvironment="3"
213 /> 215 />
214 <Tool 216 <Tool
215 Name="VCCLCompilerTool" 217 Name="VCCLCompilerTool"
@@ -237,14 +239,14 @@
237 /> 239 />
238 <Tool 240 <Tool
239 Name="VCLinkerTool" 241 Name="VCLinkerTool"
240 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" 242 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
241 OutputFile="$(OutDir)/minizip.exe" 243 OutputFile="$(OutDir)/minizip.exe"
242 LinkIncremental="2" 244 LinkIncremental="2"
243 GenerateManifest="false" 245 GenerateManifest="false"
244 GenerateDebugInformation="true" 246 GenerateDebugInformation="true"
245 ProgramDatabaseFile="$(OutDir)/minizip.pdb" 247 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
246 SubSystem="1" 248 SubSystem="1"
247 TargetMachine="5" 249 TargetMachine="17"
248 /> 250 />
249 <Tool 251 <Tool
250 Name="VCALinkTool" 252 Name="VCALinkTool"
@@ -272,9 +274,9 @@
272 /> 274 />
273 </Configuration> 275 </Configuration>
274 <Configuration 276 <Configuration
275 Name="Release|Win32" 277 Name="Debug|Itanium"
276 OutputDirectory="x86\MiniZip$(ConfigurationName)" 278 OutputDirectory="ia64\$(ConfigurationName)"
277 IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp" 279 IntermediateDirectory="ia64\$(ConfigurationName)"
278 ConfigurationType="1" 280 ConfigurationType="1"
279 InheritedPropertySheets="UpgradeFromVC70.vsprops" 281 InheritedPropertySheets="UpgradeFromVC70.vsprops"
280 CharacterSet="2" 282 CharacterSet="2"
@@ -293,19 +295,17 @@
293 /> 295 />
294 <Tool 296 <Tool
295 Name="VCMIDLTool" 297 Name="VCMIDLTool"
298 TargetEnvironment="2"
296 /> 299 />
297 <Tool 300 <Tool
298 Name="VCCLCompilerTool" 301 Name="VCCLCompilerTool"
299 Optimization="2" 302 Optimization="0"
300 InlineFunctionExpansion="1"
301 OmitFramePointers="true"
302 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 303 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
303 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" 304 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
304 StringPooling="true" 305 MinimalRebuild="true"
305 BasicRuntimeChecks="0" 306 BasicRuntimeChecks="0"
306 RuntimeLibrary="0" 307 RuntimeLibrary="3"
307 BufferSecurityCheck="false" 308 BufferSecurityCheck="false"
308 EnableFunctionLevelLinking="true"
309 UsePrecompiledHeader="0" 309 UsePrecompiledHeader="0"
310 AssemblerListingLocation="$(IntDir)\" 310 AssemblerListingLocation="$(IntDir)\"
311 WarningLevel="3" 311 WarningLevel="3"
@@ -323,15 +323,14 @@
323 /> 323 />
324 <Tool 324 <Tool
325 Name="VCLinkerTool" 325 Name="VCLinkerTool"
326 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" 326 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
327 OutputFile="$(OutDir)/minizip.exe" 327 OutputFile="$(OutDir)/minizip.exe"
328 LinkIncremental="1" 328 LinkIncremental="2"
329 GenerateManifest="false"
329 GenerateDebugInformation="true" 330 GenerateDebugInformation="true"
331 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
330 SubSystem="1" 332 SubSystem="1"
331 OptimizeReferences="2" 333 TargetMachine="5"
332 EnableCOMDATFolding="2"
333 OptimizeForWindows98="1"
334 TargetMachine="1"
335 /> 334 />
336 <Tool 335 <Tool
337 Name="VCALinkTool" 336 Name="VCALinkTool"
diff --git a/contrib/vstudio/vc8/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj
index 68c3539..9ad07ae 100644
--- a/contrib/vstudio/vc8/testzlib.vcproj
+++ b/contrib/vstudio/vc9/testzlib.vcproj
@@ -1,11 +1,12 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="9.00"
5 Name="testzlib" 5 Name="testzlib"
6 ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" 6 ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
7 RootNamespace="testzlib" 7 RootNamespace="testzlib"
8 Keyword="Win32Proj" 8 Keyword="Win32Proj"
9 TargetFrameworkVersion="131072"
9 > 10 >
10 <Platforms> 11 <Platforms>
11 <Platform 12 <Platform
@@ -47,7 +48,7 @@
47 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
48 Optimization="0" 49 Optimization="0"
49 AdditionalIncludeDirectories="..\..\.." 50 AdditionalIncludeDirectories="..\..\.."
50 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 51 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
51 MinimalRebuild="true" 52 MinimalRebuild="true"
52 BasicRuntimeChecks="0" 53 BasicRuntimeChecks="0"
53 RuntimeLibrary="1" 54 RuntimeLibrary="1"
@@ -77,6 +78,8 @@
77 GenerateDebugInformation="true" 78 GenerateDebugInformation="true"
78 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 79 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
79 SubSystem="1" 80 SubSystem="1"
81 RandomizedBaseAddress="1"
82 DataExecutionPrevention="0"
80 TargetMachine="1" 83 TargetMachine="1"
81 /> 84 />
82 <Tool 85 <Tool
@@ -98,17 +101,16 @@
98 Name="VCAppVerifierTool" 101 Name="VCAppVerifierTool"
99 /> 102 />
100 <Tool 103 <Tool
101 Name="VCWebDeploymentTool"
102 />
103 <Tool
104 Name="VCPostBuildEventTool" 104 Name="VCPostBuildEventTool"
105 /> 105 />
106 </Configuration> 106 </Configuration>
107 <Configuration 107 <Configuration
108 Name="Debug|x64" 108 Name="ReleaseWithoutAsm|Win32"
109 OutputDirectory="x64\TestZlib$(ConfigurationName)" 109 OutputDirectory="x86\TestZlib$(ConfigurationName)"
110 IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" 110 IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
111 ConfigurationType="1" 111 ConfigurationType="1"
112 CharacterSet="2"
113 WholeProgramOptimization="1"
112 > 114 >
113 <Tool 115 <Tool
114 Name="VCPreBuildEventTool" 116 Name="VCPreBuildEventTool"
@@ -127,12 +129,21 @@
127 /> 129 />
128 <Tool 130 <Tool
129 Name="VCCLCompilerTool" 131 Name="VCCLCompilerTool"
132 Optimization="2"
133 InlineFunctionExpansion="1"
134 OmitFramePointers="true"
130 AdditionalIncludeDirectories="..\..\.." 135 AdditionalIncludeDirectories="..\..\.."
131 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 136 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
137 StringPooling="true"
132 BasicRuntimeChecks="0" 138 BasicRuntimeChecks="0"
133 RuntimeLibrary="3" 139 RuntimeLibrary="0"
134 BufferSecurityCheck="false" 140 BufferSecurityCheck="false"
141 EnableFunctionLevelLinking="true"
142 UsePrecompiledHeader="0"
135 AssemblerListingLocation="$(IntDir)\" 143 AssemblerListingLocation="$(IntDir)\"
144 WarningLevel="3"
145 Detect64BitPortabilityProblems="true"
146 DebugInformationFormat="3"
136 /> 147 />
137 <Tool 148 <Tool
138 Name="VCManagedResourceCompilerTool" 149 Name="VCManagedResourceCompilerTool"
@@ -145,8 +156,17 @@
145 /> 156 />
146 <Tool 157 <Tool
147 Name="VCLinkerTool" 158 Name="VCLinkerTool"
148 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" 159 OutputFile="$(OutDir)/testzlib.exe"
160 LinkIncremental="1"
149 GenerateManifest="false" 161 GenerateManifest="false"
162 GenerateDebugInformation="true"
163 SubSystem="1"
164 OptimizeReferences="2"
165 EnableCOMDATFolding="2"
166 OptimizeForWindows98="1"
167 RandomizedBaseAddress="1"
168 DataExecutionPrevention="0"
169 TargetMachine="1"
150 /> 170 />
151 <Tool 171 <Tool
152 Name="VCALinkTool" 172 Name="VCALinkTool"
@@ -167,18 +187,16 @@
167 Name="VCAppVerifierTool" 187 Name="VCAppVerifierTool"
168 /> 188 />
169 <Tool 189 <Tool
170 Name="VCWebDeploymentTool"
171 />
172 <Tool
173 Name="VCPostBuildEventTool" 190 Name="VCPostBuildEventTool"
174 /> 191 />
175 </Configuration> 192 </Configuration>
176 <Configuration 193 <Configuration
177 Name="Debug|Itanium" 194 Name="Release|Win32"
178 OutputDirectory="ia64\TestZlib$(ConfigurationName)" 195 OutputDirectory="x86\TestZlib$(ConfigurationName)"
179 IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" 196 IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
180 ConfigurationType="1" 197 ConfigurationType="1"
181 CharacterSet="2" 198 CharacterSet="2"
199 WholeProgramOptimization="1"
182 > 200 >
183 <Tool 201 <Tool
184 Name="VCPreBuildEventTool" 202 Name="VCPreBuildEventTool"
@@ -194,19 +212,20 @@
194 /> 212 />
195 <Tool 213 <Tool
196 Name="VCMIDLTool" 214 Name="VCMIDLTool"
197 TargetEnvironment="2"
198 /> 215 />
199 <Tool 216 <Tool
200 Name="VCCLCompilerTool" 217 Name="VCCLCompilerTool"
201 Optimization="0" 218 Optimization="2"
219 InlineFunctionExpansion="1"
220 OmitFramePointers="true"
202 AdditionalIncludeDirectories="..\..\.." 221 AdditionalIncludeDirectories="..\..\.."
203 PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 222 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
204 MinimalRebuild="true" 223 StringPooling="true"
205 BasicRuntimeChecks="0" 224 BasicRuntimeChecks="0"
206 RuntimeLibrary="3" 225 RuntimeLibrary="0"
207 BufferSecurityCheck="false" 226 BufferSecurityCheck="false"
227 EnableFunctionLevelLinking="true"
208 UsePrecompiledHeader="0" 228 UsePrecompiledHeader="0"
209 AssemblerOutput="4"
210 AssemblerListingLocation="$(IntDir)\" 229 AssemblerListingLocation="$(IntDir)\"
211 WarningLevel="3" 230 WarningLevel="3"
212 Detect64BitPortabilityProblems="true" 231 Detect64BitPortabilityProblems="true"
@@ -223,13 +242,18 @@
223 /> 242 />
224 <Tool 243 <Tool
225 Name="VCLinkerTool" 244 Name="VCLinkerTool"
245 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
226 OutputFile="$(OutDir)/testzlib.exe" 246 OutputFile="$(OutDir)/testzlib.exe"
227 LinkIncremental="2" 247 LinkIncremental="1"
228 GenerateManifest="false" 248 GenerateManifest="false"
229 GenerateDebugInformation="true" 249 GenerateDebugInformation="true"
230 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
231 SubSystem="1" 250 SubSystem="1"
232 TargetMachine="5" 251 OptimizeReferences="2"
252 EnableCOMDATFolding="2"
253 OptimizeForWindows98="1"
254 RandomizedBaseAddress="1"
255 DataExecutionPrevention="0"
256 TargetMachine="1"
233 /> 257 />
234 <Tool 258 <Tool
235 Name="VCALinkTool" 259 Name="VCALinkTool"
@@ -250,19 +274,14 @@
250 Name="VCAppVerifierTool" 274 Name="VCAppVerifierTool"
251 /> 275 />
252 <Tool 276 <Tool
253 Name="VCWebDeploymentTool"
254 />
255 <Tool
256 Name="VCPostBuildEventTool" 277 Name="VCPostBuildEventTool"
257 /> 278 />
258 </Configuration> 279 </Configuration>
259 <Configuration 280 <Configuration
260 Name="ReleaseWithoutAsm|Win32" 281 Name="Debug|x64"
261 OutputDirectory="x86\TestZlib$(ConfigurationName)" 282 OutputDirectory="x64\TestZlib$(ConfigurationName)"
262 IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" 283 IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
263 ConfigurationType="1" 284 ConfigurationType="1"
264 CharacterSet="2"
265 WholeProgramOptimization="1"
266 > 285 >
267 <Tool 286 <Tool
268 Name="VCPreBuildEventTool" 287 Name="VCPreBuildEventTool"
@@ -281,21 +300,12 @@
281 /> 300 />
282 <Tool 301 <Tool
283 Name="VCCLCompilerTool" 302 Name="VCCLCompilerTool"
284 Optimization="2"
285 InlineFunctionExpansion="1"
286 OmitFramePointers="true"
287 AdditionalIncludeDirectories="..\..\.." 303 AdditionalIncludeDirectories="..\..\.."
288 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 304 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
289 StringPooling="true"
290 BasicRuntimeChecks="0" 305 BasicRuntimeChecks="0"
291 RuntimeLibrary="0" 306 RuntimeLibrary="3"
292 BufferSecurityCheck="false" 307 BufferSecurityCheck="false"
293 EnableFunctionLevelLinking="true"
294 UsePrecompiledHeader="0"
295 AssemblerListingLocation="$(IntDir)\" 308 AssemblerListingLocation="$(IntDir)\"
296 WarningLevel="3"
297 Detect64BitPortabilityProblems="true"
298 DebugInformationFormat="3"
299 /> 309 />
300 <Tool 310 <Tool
301 Name="VCManagedResourceCompilerTool" 311 Name="VCManagedResourceCompilerTool"
@@ -308,15 +318,8 @@
308 /> 318 />
309 <Tool 319 <Tool
310 Name="VCLinkerTool" 320 Name="VCLinkerTool"
311 OutputFile="$(OutDir)/testzlib.exe" 321 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
312 LinkIncremental="1"
313 GenerateManifest="false" 322 GenerateManifest="false"
314 GenerateDebugInformation="true"
315 SubSystem="1"
316 OptimizeReferences="2"
317 EnableCOMDATFolding="2"
318 OptimizeForWindows98="1"
319 TargetMachine="1"
320 /> 323 />
321 <Tool 324 <Tool
322 Name="VCALinkTool" 325 Name="VCALinkTool"
@@ -344,11 +347,11 @@
344 /> 347 />
345 </Configuration> 348 </Configuration>
346 <Configuration 349 <Configuration
347 Name="ReleaseWithoutAsm|x64" 350 Name="Debug|Itanium"
348 OutputDirectory="x64\TestZlib$(ConfigurationName)" 351 OutputDirectory="ia64\TestZlib$(ConfigurationName)"
349 IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" 352 IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
350 ConfigurationType="1" 353 ConfigurationType="1"
351 WholeProgramOptimization="1" 354 CharacterSet="2"
352 > 355 >
353 <Tool 356 <Tool
354 Name="VCPreBuildEventTool" 357 Name="VCPreBuildEventTool"
@@ -364,15 +367,23 @@
364 /> 367 />
365 <Tool 368 <Tool
366 Name="VCMIDLTool" 369 Name="VCMIDLTool"
370 TargetEnvironment="2"
367 /> 371 />
368 <Tool 372 <Tool
369 Name="VCCLCompilerTool" 373 Name="VCCLCompilerTool"
374 Optimization="0"
370 AdditionalIncludeDirectories="..\..\.." 375 AdditionalIncludeDirectories="..\..\.."
371 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 376 PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
377 MinimalRebuild="true"
372 BasicRuntimeChecks="0" 378 BasicRuntimeChecks="0"
373 RuntimeLibrary="2" 379 RuntimeLibrary="3"
374 BufferSecurityCheck="false" 380 BufferSecurityCheck="false"
381 UsePrecompiledHeader="0"
382 AssemblerOutput="4"
375 AssemblerListingLocation="$(IntDir)\" 383 AssemblerListingLocation="$(IntDir)\"
384 WarningLevel="3"
385 Detect64BitPortabilityProblems="true"
386 DebugInformationFormat="3"
376 /> 387 />
377 <Tool 388 <Tool
378 Name="VCManagedResourceCompilerTool" 389 Name="VCManagedResourceCompilerTool"
@@ -385,8 +396,13 @@
385 /> 396 />
386 <Tool 397 <Tool
387 Name="VCLinkerTool" 398 Name="VCLinkerTool"
388 AdditionalDependencies="" 399 OutputFile="$(OutDir)/testzlib.exe"
400 LinkIncremental="2"
389 GenerateManifest="false" 401 GenerateManifest="false"
402 GenerateDebugInformation="true"
403 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
404 SubSystem="1"
405 TargetMachine="5"
390 /> 406 />
391 <Tool 407 <Tool
392 Name="VCALinkTool" 408 Name="VCALinkTool"
@@ -414,11 +430,10 @@
414 /> 430 />
415 </Configuration> 431 </Configuration>
416 <Configuration 432 <Configuration
417 Name="ReleaseWithoutAsm|Itanium" 433 Name="ReleaseWithoutAsm|x64"
418 OutputDirectory="ia64\TestZlib$(ConfigurationName)" 434 OutputDirectory="x64\TestZlib$(ConfigurationName)"
419 IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" 435 IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
420 ConfigurationType="1" 436 ConfigurationType="1"
421 CharacterSet="2"
422 WholeProgramOptimization="1" 437 WholeProgramOptimization="1"
423 > 438 >
424 <Tool 439 <Tool
@@ -435,25 +450,15 @@
435 /> 450 />
436 <Tool 451 <Tool
437 Name="VCMIDLTool" 452 Name="VCMIDLTool"
438 TargetEnvironment="2"
439 /> 453 />
440 <Tool 454 <Tool
441 Name="VCCLCompilerTool" 455 Name="VCCLCompilerTool"
442 Optimization="2"
443 InlineFunctionExpansion="1"
444 OmitFramePointers="true"
445 AdditionalIncludeDirectories="..\..\.." 456 AdditionalIncludeDirectories="..\..\.."
446 PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 457 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
447 StringPooling="true"
448 BasicRuntimeChecks="0" 458 BasicRuntimeChecks="0"
449 RuntimeLibrary="2" 459 RuntimeLibrary="2"
450 BufferSecurityCheck="false" 460 BufferSecurityCheck="false"
451 EnableFunctionLevelLinking="true"
452 UsePrecompiledHeader="0"
453 AssemblerListingLocation="$(IntDir)\" 461 AssemblerListingLocation="$(IntDir)\"
454 WarningLevel="3"
455 Detect64BitPortabilityProblems="true"
456 DebugInformationFormat="3"
457 /> 462 />
458 <Tool 463 <Tool
459 Name="VCManagedResourceCompilerTool" 464 Name="VCManagedResourceCompilerTool"
@@ -466,15 +471,8 @@
466 /> 471 />
467 <Tool 472 <Tool
468 Name="VCLinkerTool" 473 Name="VCLinkerTool"
469 OutputFile="$(OutDir)/testzlib.exe" 474 AdditionalDependencies=""
470 LinkIncremental="1"
471 GenerateManifest="false" 475 GenerateManifest="false"
472 GenerateDebugInformation="true"
473 SubSystem="1"
474 OptimizeReferences="2"
475 EnableCOMDATFolding="2"
476 OptimizeForWindows98="1"
477 TargetMachine="5"
478 /> 476 />
479 <Tool 477 <Tool
480 Name="VCALinkTool" 478 Name="VCALinkTool"
@@ -502,9 +500,9 @@
502 /> 500 />
503 </Configuration> 501 </Configuration>
504 <Configuration 502 <Configuration
505 Name="Release|Win32" 503 Name="ReleaseWithoutAsm|Itanium"
506 OutputDirectory="x86\TestZlib$(ConfigurationName)" 504 OutputDirectory="ia64\TestZlib$(ConfigurationName)"
507 IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" 505 IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
508 ConfigurationType="1" 506 ConfigurationType="1"
509 CharacterSet="2" 507 CharacterSet="2"
510 WholeProgramOptimization="1" 508 WholeProgramOptimization="1"
@@ -523,6 +521,7 @@
523 /> 521 />
524 <Tool 522 <Tool
525 Name="VCMIDLTool" 523 Name="VCMIDLTool"
524 TargetEnvironment="2"
526 /> 525 />
527 <Tool 526 <Tool
528 Name="VCCLCompilerTool" 527 Name="VCCLCompilerTool"
@@ -530,10 +529,10 @@
530 InlineFunctionExpansion="1" 529 InlineFunctionExpansion="1"
531 OmitFramePointers="true" 530 OmitFramePointers="true"
532 AdditionalIncludeDirectories="..\..\.." 531 AdditionalIncludeDirectories="..\..\.."
533 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 532 PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
534 StringPooling="true" 533 StringPooling="true"
535 BasicRuntimeChecks="0" 534 BasicRuntimeChecks="0"
536 RuntimeLibrary="0" 535 RuntimeLibrary="2"
537 BufferSecurityCheck="false" 536 BufferSecurityCheck="false"
538 EnableFunctionLevelLinking="true" 537 EnableFunctionLevelLinking="true"
539 UsePrecompiledHeader="0" 538 UsePrecompiledHeader="0"
@@ -553,7 +552,6 @@
553 /> 552 />
554 <Tool 553 <Tool
555 Name="VCLinkerTool" 554 Name="VCLinkerTool"
556 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
557 OutputFile="$(OutDir)/testzlib.exe" 555 OutputFile="$(OutDir)/testzlib.exe"
558 LinkIncremental="1" 556 LinkIncremental="1"
559 GenerateManifest="false" 557 GenerateManifest="false"
@@ -562,7 +560,7 @@
562 OptimizeReferences="2" 560 OptimizeReferences="2"
563 EnableCOMDATFolding="2" 561 EnableCOMDATFolding="2"
564 OptimizeForWindows98="1" 562 OptimizeForWindows98="1"
565 TargetMachine="1" 563 TargetMachine="5"
566 /> 564 />
567 <Tool 565 <Tool
568 Name="VCALinkTool" 566 Name="VCALinkTool"
@@ -614,7 +612,7 @@
614 <Tool 612 <Tool
615 Name="VCCLCompilerTool" 613 Name="VCCLCompilerTool"
616 AdditionalIncludeDirectories="..\..\.." 614 AdditionalIncludeDirectories="..\..\.."
617 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 615 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
618 BasicRuntimeChecks="0" 616 BasicRuntimeChecks="0"
619 RuntimeLibrary="2" 617 RuntimeLibrary="2"
620 BufferSecurityCheck="false" 618 BufferSecurityCheck="false"
@@ -689,7 +687,7 @@
689 InlineFunctionExpansion="1" 687 InlineFunctionExpansion="1"
690 OmitFramePointers="true" 688 OmitFramePointers="true"
691 AdditionalIncludeDirectories="..\..\.." 689 AdditionalIncludeDirectories="..\..\.."
692 PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 690 PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
693 StringPooling="true" 691 StringPooling="true"
694 BasicRuntimeChecks="0" 692 BasicRuntimeChecks="0"
695 RuntimeLibrary="2" 693 RuntimeLibrary="2"
@@ -863,7 +861,7 @@
863 /> 861 />
864 </FileConfiguration> 862 </FileConfiguration>
865 <FileConfiguration 863 <FileConfiguration
866 Name="Debug|Itanium" 864 Name="ReleaseWithoutAsm|Win32"
867 ExcludedFromBuild="true" 865 ExcludedFromBuild="true"
868 > 866 >
869 <Tool 867 <Tool
@@ -871,7 +869,7 @@
871 /> 869 />
872 </FileConfiguration> 870 </FileConfiguration>
873 <FileConfiguration 871 <FileConfiguration
874 Name="ReleaseWithoutAsm|Win32" 872 Name="Release|Win32"
875 ExcludedFromBuild="true" 873 ExcludedFromBuild="true"
876 > 874 >
877 <Tool 875 <Tool
@@ -879,7 +877,7 @@
879 /> 877 />
880 </FileConfiguration> 878 </FileConfiguration>
881 <FileConfiguration 879 <FileConfiguration
882 Name="ReleaseWithoutAsm|Itanium" 880 Name="Debug|Itanium"
883 ExcludedFromBuild="true" 881 ExcludedFromBuild="true"
884 > 882 >
885 <Tool 883 <Tool
@@ -887,7 +885,7 @@
887 /> 885 />
888 </FileConfiguration> 886 </FileConfiguration>
889 <FileConfiguration 887 <FileConfiguration
890 Name="Release|Win32" 888 Name="ReleaseWithoutAsm|Itanium"
891 ExcludedFromBuild="true" 889 ExcludedFromBuild="true"
892 > 890 >
893 <Tool 891 <Tool
diff --git a/contrib/vstudio/vc8/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj
index f38ab5e..b1ddde0 100644
--- a/contrib/vstudio/vc8/testzlibdll.vcproj
+++ b/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -1,11 +1,11 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="9.00"
5 Name="TestZlibDll" 5 Name="TestZlibDll"
6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}" 6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 SignManifests="true" 8 TargetFrameworkVersion="131072"
9 > 9 >
10 <Platforms> 10 <Platforms>
11 <Platform 11 <Platform
@@ -77,6 +77,8 @@
77 GenerateDebugInformation="true" 77 GenerateDebugInformation="true"
78 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 78 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
79 SubSystem="1" 79 SubSystem="1"
80 RandomizedBaseAddress="1"
81 DataExecutionPrevention="0"
80 TargetMachine="1" 82 TargetMachine="1"
81 /> 83 />
82 <Tool 84 <Tool
@@ -98,16 +100,13 @@
98 Name="VCAppVerifierTool" 100 Name="VCAppVerifierTool"
99 /> 101 />
100 <Tool 102 <Tool
101 Name="VCWebDeploymentTool"
102 />
103 <Tool
104 Name="VCPostBuildEventTool" 103 Name="VCPostBuildEventTool"
105 /> 104 />
106 </Configuration> 105 </Configuration>
107 <Configuration 106 <Configuration
108 Name="Debug|x64" 107 Name="Release|Win32"
109 OutputDirectory="x64\TestZlibDll$(ConfigurationName)" 108 OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
110 IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp" 109 IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
111 ConfigurationType="1" 110 ConfigurationType="1"
112 InheritedPropertySheets="UpgradeFromVC70.vsprops" 111 InheritedPropertySheets="UpgradeFromVC70.vsprops"
113 CharacterSet="2" 112 CharacterSet="2"
@@ -126,17 +125,19 @@
126 /> 125 />
127 <Tool 126 <Tool
128 Name="VCMIDLTool" 127 Name="VCMIDLTool"
129 TargetEnvironment="3"
130 /> 128 />
131 <Tool 129 <Tool
132 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
133 Optimization="0" 131 Optimization="2"
132 InlineFunctionExpansion="1"
133 OmitFramePointers="true"
134 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
135 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" 135 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
136 MinimalRebuild="true" 136 StringPooling="true"
137 BasicRuntimeChecks="0" 137 BasicRuntimeChecks="0"
138 RuntimeLibrary="3" 138 RuntimeLibrary="0"
139 BufferSecurityCheck="false" 139 BufferSecurityCheck="false"
140 EnableFunctionLevelLinking="true"
140 UsePrecompiledHeader="0" 141 UsePrecompiledHeader="0"
141 AssemblerListingLocation="$(IntDir)\" 142 AssemblerListingLocation="$(IntDir)\"
142 WarningLevel="3" 143 WarningLevel="3"
@@ -154,14 +155,18 @@
154 /> 155 />
155 <Tool 156 <Tool
156 Name="VCLinkerTool" 157 Name="VCLinkerTool"
157 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" 158 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
158 OutputFile="$(OutDir)/testzlib.exe" 159 OutputFile="$(OutDir)/testzlib.exe"
159 LinkIncremental="2" 160 LinkIncremental="1"
160 GenerateManifest="false" 161 GenerateManifest="false"
161 GenerateDebugInformation="true" 162 GenerateDebugInformation="true"
162 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
163 SubSystem="1" 163 SubSystem="1"
164 TargetMachine="17" 164 OptimizeReferences="2"
165 EnableCOMDATFolding="2"
166 OptimizeForWindows98="1"
167 RandomizedBaseAddress="1"
168 DataExecutionPrevention="0"
169 TargetMachine="1"
165 /> 170 />
166 <Tool 171 <Tool
167 Name="VCALinkTool" 172 Name="VCALinkTool"
@@ -182,16 +187,13 @@
182 Name="VCAppVerifierTool" 187 Name="VCAppVerifierTool"
183 /> 188 />
184 <Tool 189 <Tool
185 Name="VCWebDeploymentTool"
186 />
187 <Tool
188 Name="VCPostBuildEventTool" 190 Name="VCPostBuildEventTool"
189 /> 191 />
190 </Configuration> 192 </Configuration>
191 <Configuration 193 <Configuration
192 Name="Debug|Itanium" 194 Name="Debug|x64"
193 OutputDirectory="ia64\TestZlibDll$(ConfigurationName)" 195 OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
194 IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp" 196 IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
195 ConfigurationType="1" 197 ConfigurationType="1"
196 InheritedPropertySheets="UpgradeFromVC70.vsprops" 198 InheritedPropertySheets="UpgradeFromVC70.vsprops"
197 CharacterSet="2" 199 CharacterSet="2"
@@ -210,7 +212,7 @@
210 /> 212 />
211 <Tool 213 <Tool
212 Name="VCMIDLTool" 214 Name="VCMIDLTool"
213 TargetEnvironment="2" 215 TargetEnvironment="3"
214 /> 216 />
215 <Tool 217 <Tool
216 Name="VCCLCompilerTool" 218 Name="VCCLCompilerTool"
@@ -238,14 +240,14 @@
238 /> 240 />
239 <Tool 241 <Tool
240 Name="VCLinkerTool" 242 Name="VCLinkerTool"
241 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" 243 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
242 OutputFile="$(OutDir)/testzlib.exe" 244 OutputFile="$(OutDir)/testzlib.exe"
243 LinkIncremental="2" 245 LinkIncremental="2"
244 GenerateManifest="false" 246 GenerateManifest="false"
245 GenerateDebugInformation="true" 247 GenerateDebugInformation="true"
246 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 248 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
247 SubSystem="1" 249 SubSystem="1"
248 TargetMachine="5" 250 TargetMachine="17"
249 /> 251 />
250 <Tool 252 <Tool
251 Name="VCALinkTool" 253 Name="VCALinkTool"
@@ -273,9 +275,9 @@
273 /> 275 />
274 </Configuration> 276 </Configuration>
275 <Configuration 277 <Configuration
276 Name="Release|Win32" 278 Name="Debug|Itanium"
277 OutputDirectory="x86\TestZlibDll$(ConfigurationName)" 279 OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
278 IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp" 280 IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
279 ConfigurationType="1" 281 ConfigurationType="1"
280 InheritedPropertySheets="UpgradeFromVC70.vsprops" 282 InheritedPropertySheets="UpgradeFromVC70.vsprops"
281 CharacterSet="2" 283 CharacterSet="2"
@@ -294,19 +296,17 @@
294 /> 296 />
295 <Tool 297 <Tool
296 Name="VCMIDLTool" 298 Name="VCMIDLTool"
299 TargetEnvironment="2"
297 /> 300 />
298 <Tool 301 <Tool
299 Name="VCCLCompilerTool" 302 Name="VCCLCompilerTool"
300 Optimization="2" 303 Optimization="0"
301 InlineFunctionExpansion="1"
302 OmitFramePointers="true"
303 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 304 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
304 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" 305 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
305 StringPooling="true" 306 MinimalRebuild="true"
306 BasicRuntimeChecks="0" 307 BasicRuntimeChecks="0"
307 RuntimeLibrary="0" 308 RuntimeLibrary="3"
308 BufferSecurityCheck="false" 309 BufferSecurityCheck="false"
309 EnableFunctionLevelLinking="true"
310 UsePrecompiledHeader="0" 310 UsePrecompiledHeader="0"
311 AssemblerListingLocation="$(IntDir)\" 311 AssemblerListingLocation="$(IntDir)\"
312 WarningLevel="3" 312 WarningLevel="3"
@@ -324,16 +324,14 @@
324 /> 324 />
325 <Tool 325 <Tool
326 Name="VCLinkerTool" 326 Name="VCLinkerTool"
327 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" 327 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
328 OutputFile="$(OutDir)/testzlib.exe" 328 OutputFile="$(OutDir)/testzlib.exe"
329 LinkIncremental="1" 329 LinkIncremental="2"
330 GenerateManifest="false" 330 GenerateManifest="false"
331 GenerateDebugInformation="true" 331 GenerateDebugInformation="true"
332 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
332 SubSystem="1" 333 SubSystem="1"
333 OptimizeReferences="2" 334 TargetMachine="5"
334 EnableCOMDATFolding="2"
335 OptimizeForWindows98="1"
336 TargetMachine="1"
337 /> 335 />
338 <Tool 336 <Tool
339 Name="VCALinkTool" 337 Name="VCALinkTool"
diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 266fb83..72cb8b4 100644
--- a/contrib/vstudio/vc7/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1,2,3,8 5 FILEVERSION 1,2,3,0
6 PRODUCTVERSION 1,2,3,8 6 PRODUCTVERSION 1,2,3,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.2.3.8\0" 20 VALUE "FileVersion", "1.2.3.0\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlib.dll\0" 22 VALUE "OriginalFilename", "zlib.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj
index 51a4073..ff9813a 100644
--- a/contrib/vstudio/vc8/zlibstat.vcproj
+++ b/contrib/vstudio/vc9/zlibstat.vcproj
@@ -1,9 +1,10 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="9.00"
5 Name="zlibstat" 5 Name="zlibstat"
6 ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" 6 ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
7 TargetFrameworkVersion="131072"
7 > 8 >
8 <Platforms> 9 <Platforms>
9 <Platform 10 <Platform
@@ -47,7 +48,7 @@
47 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
48 Optimization="0" 49 Optimization="0"
49 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 50 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
50 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 51 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
51 ExceptionHandling="0" 52 ExceptionHandling="0"
52 RuntimeLibrary="1" 53 RuntimeLibrary="1"
53 BufferSecurityCheck="false" 54 BufferSecurityCheck="false"
@@ -93,9 +94,9 @@
93 /> 94 />
94 </Configuration> 95 </Configuration>
95 <Configuration 96 <Configuration
96 Name="Debug|x64" 97 Name="Release|Win32"
97 OutputDirectory="x64\ZlibStat$(ConfigurationName)" 98 OutputDirectory="x86\ZlibStat$(ConfigurationName)"
98 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" 99 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
99 ConfigurationType="4" 100 ConfigurationType="4"
100 InheritedPropertySheets="UpgradeFromVC70.vsprops" 101 InheritedPropertySheets="UpgradeFromVC70.vsprops"
101 UseOfMFC="0" 102 UseOfMFC="0"
@@ -115,24 +116,23 @@
115 /> 116 />
116 <Tool 117 <Tool
117 Name="VCMIDLTool" 118 Name="VCMIDLTool"
118 TargetEnvironment="3"
119 /> 119 />
120 <Tool 120 <Tool
121 Name="VCCLCompilerTool" 121 Name="VCCLCompilerTool"
122 Optimization="0" 122 InlineFunctionExpansion="1"
123 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 123 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
124 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 124 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
125 StringPooling="true"
125 ExceptionHandling="0" 126 ExceptionHandling="0"
126 RuntimeLibrary="3" 127 RuntimeLibrary="0"
127 BufferSecurityCheck="false" 128 BufferSecurityCheck="false"
129 EnableFunctionLevelLinking="true"
128 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 130 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
129 AssemblerListingLocation="$(IntDir)\" 131 AssemblerListingLocation="$(IntDir)\"
130 ObjectFile="$(IntDir)\" 132 ObjectFile="$(IntDir)\"
131 ProgramDataBaseFileName="$(OutDir)\" 133 ProgramDataBaseFileName="$(OutDir)\"
132 WarningLevel="3" 134 WarningLevel="3"
133 SuppressStartupBanner="true" 135 SuppressStartupBanner="true"
134 Detect64BitPortabilityProblems="true"
135 DebugInformationFormat="1"
136 /> 136 />
137 <Tool 137 <Tool
138 Name="VCManagedResourceCompilerTool" 138 Name="VCManagedResourceCompilerTool"
@@ -146,7 +146,8 @@
146 /> 146 />
147 <Tool 147 <Tool
148 Name="VCLibrarianTool" 148 Name="VCLibrarianTool"
149 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" 149 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
150 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
150 OutputFile="$(OutDir)\zlibstat.lib" 151 OutputFile="$(OutDir)\zlibstat.lib"
151 SuppressStartupBanner="true" 152 SuppressStartupBanner="true"
152 /> 153 />
@@ -167,9 +168,9 @@
167 /> 168 />
168 </Configuration> 169 </Configuration>
169 <Configuration 170 <Configuration
170 Name="Debug|Itanium" 171 Name="ReleaseWithoutAsm|Win32"
171 OutputDirectory="ia64\ZlibStat$(ConfigurationName)" 172 OutputDirectory="x86\ZlibStat$(ConfigurationName)"
172 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" 173 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
173 ConfigurationType="4" 174 ConfigurationType="4"
174 InheritedPropertySheets="UpgradeFromVC70.vsprops" 175 InheritedPropertySheets="UpgradeFromVC70.vsprops"
175 UseOfMFC="0" 176 UseOfMFC="0"
@@ -189,24 +190,23 @@
189 /> 190 />
190 <Tool 191 <Tool
191 Name="VCMIDLTool" 192 Name="VCMIDLTool"
192 TargetEnvironment="2"
193 /> 193 />
194 <Tool 194 <Tool
195 Name="VCCLCompilerTool" 195 Name="VCCLCompilerTool"
196 Optimization="0" 196 InlineFunctionExpansion="1"
197 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 197 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
198 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 198 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
199 StringPooling="true"
199 ExceptionHandling="0" 200 ExceptionHandling="0"
200 RuntimeLibrary="3" 201 RuntimeLibrary="0"
201 BufferSecurityCheck="false" 202 BufferSecurityCheck="false"
203 EnableFunctionLevelLinking="true"
202 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 204 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
203 AssemblerListingLocation="$(IntDir)\" 205 AssemblerListingLocation="$(IntDir)\"
204 ObjectFile="$(IntDir)\" 206 ObjectFile="$(IntDir)\"
205 ProgramDataBaseFileName="$(OutDir)\" 207 ProgramDataBaseFileName="$(OutDir)\"
206 WarningLevel="3" 208 WarningLevel="3"
207 SuppressStartupBanner="true" 209 SuppressStartupBanner="true"
208 Detect64BitPortabilityProblems="true"
209 DebugInformationFormat="1"
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCManagedResourceCompilerTool" 212 Name="VCManagedResourceCompilerTool"
@@ -220,7 +220,7 @@
220 /> 220 />
221 <Tool 221 <Tool
222 Name="VCLibrarianTool" 222 Name="VCLibrarianTool"
223 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" 223 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
224 OutputFile="$(OutDir)\zlibstat.lib" 224 OutputFile="$(OutDir)\zlibstat.lib"
225 SuppressStartupBanner="true" 225 SuppressStartupBanner="true"
226 /> 226 />
@@ -241,9 +241,9 @@
241 /> 241 />
242 </Configuration> 242 </Configuration>
243 <Configuration 243 <Configuration
244 Name="Release|Win32" 244 Name="Debug|x64"
245 OutputDirectory="x86\ZlibStat$(ConfigurationName)" 245 OutputDirectory="x64\ZlibStat$(ConfigurationName)"
246 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" 246 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
247 ConfigurationType="4" 247 ConfigurationType="4"
248 InheritedPropertySheets="UpgradeFromVC70.vsprops" 248 InheritedPropertySheets="UpgradeFromVC70.vsprops"
249 UseOfMFC="0" 249 UseOfMFC="0"
@@ -263,23 +263,24 @@
263 /> 263 />
264 <Tool 264 <Tool
265 Name="VCMIDLTool" 265 Name="VCMIDLTool"
266 TargetEnvironment="3"
266 /> 267 />
267 <Tool 268 <Tool
268 Name="VCCLCompilerTool" 269 Name="VCCLCompilerTool"
269 InlineFunctionExpansion="1" 270 Optimization="0"
270 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 271 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
271 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF" 272 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
272 StringPooling="true"
273 ExceptionHandling="0" 273 ExceptionHandling="0"
274 RuntimeLibrary="0" 274 RuntimeLibrary="3"
275 BufferSecurityCheck="false" 275 BufferSecurityCheck="false"
276 EnableFunctionLevelLinking="true"
277 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 276 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
278 AssemblerListingLocation="$(IntDir)\" 277 AssemblerListingLocation="$(IntDir)\"
279 ObjectFile="$(IntDir)\" 278 ObjectFile="$(IntDir)\"
280 ProgramDataBaseFileName="$(OutDir)\" 279 ProgramDataBaseFileName="$(OutDir)\"
281 WarningLevel="3" 280 WarningLevel="3"
282 SuppressStartupBanner="true" 281 SuppressStartupBanner="true"
282 Detect64BitPortabilityProblems="true"
283 DebugInformationFormat="1"
283 /> 284 />
284 <Tool 285 <Tool
285 Name="VCManagedResourceCompilerTool" 286 Name="VCManagedResourceCompilerTool"
@@ -293,8 +294,7 @@
293 /> 294 />
294 <Tool 295 <Tool
295 Name="VCLibrarianTool" 296 Name="VCLibrarianTool"
296 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" 297 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
297 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
298 OutputFile="$(OutDir)\zlibstat.lib" 298 OutputFile="$(OutDir)\zlibstat.lib"
299 SuppressStartupBanner="true" 299 SuppressStartupBanner="true"
300 /> 300 />
@@ -315,9 +315,9 @@
315 /> 315 />
316 </Configuration> 316 </Configuration>
317 <Configuration 317 <Configuration
318 Name="Release|x64" 318 Name="Debug|Itanium"
319 OutputDirectory="x64\ZlibStat$(ConfigurationName)" 319 OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
320 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" 320 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
321 ConfigurationType="4" 321 ConfigurationType="4"
322 InheritedPropertySheets="UpgradeFromVC70.vsprops" 322 InheritedPropertySheets="UpgradeFromVC70.vsprops"
323 UseOfMFC="0" 323 UseOfMFC="0"
@@ -337,24 +337,24 @@
337 /> 337 />
338 <Tool 338 <Tool
339 Name="VCMIDLTool" 339 Name="VCMIDLTool"
340 TargetEnvironment="3" 340 TargetEnvironment="2"
341 /> 341 />
342 <Tool 342 <Tool
343 Name="VCCLCompilerTool" 343 Name="VCCLCompilerTool"
344 InlineFunctionExpansion="1" 344 Optimization="0"
345 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 345 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
346 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF;WIN64" 346 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
347 StringPooling="true"
348 ExceptionHandling="0" 347 ExceptionHandling="0"
349 RuntimeLibrary="2" 348 RuntimeLibrary="3"
350 BufferSecurityCheck="false" 349 BufferSecurityCheck="false"
351 EnableFunctionLevelLinking="true"
352 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 350 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
353 AssemblerListingLocation="$(IntDir)\" 351 AssemblerListingLocation="$(IntDir)\"
354 ObjectFile="$(IntDir)\" 352 ObjectFile="$(IntDir)\"
355 ProgramDataBaseFileName="$(OutDir)\" 353 ProgramDataBaseFileName="$(OutDir)\"
356 WarningLevel="3" 354 WarningLevel="3"
357 SuppressStartupBanner="true" 355 SuppressStartupBanner="true"
356 Detect64BitPortabilityProblems="true"
357 DebugInformationFormat="1"
358 /> 358 />
359 <Tool 359 <Tool
360 Name="VCManagedResourceCompilerTool" 360 Name="VCManagedResourceCompilerTool"
@@ -368,8 +368,7 @@
368 /> 368 />
369 <Tool 369 <Tool
370 Name="VCLibrarianTool" 370 Name="VCLibrarianTool"
371 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" 371 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
372 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
373 OutputFile="$(OutDir)\zlibstat.lib" 372 OutputFile="$(OutDir)\zlibstat.lib"
374 SuppressStartupBanner="true" 373 SuppressStartupBanner="true"
375 /> 374 />
@@ -390,9 +389,9 @@
390 /> 389 />
391 </Configuration> 390 </Configuration>
392 <Configuration 391 <Configuration
393 Name="Release|Itanium" 392 Name="Release|x64"
394 OutputDirectory="ia64\ZlibStat$(ConfigurationName)" 393 OutputDirectory="x64\ZlibStat$(ConfigurationName)"
395 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" 394 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
396 ConfigurationType="4" 395 ConfigurationType="4"
397 InheritedPropertySheets="UpgradeFromVC70.vsprops" 396 InheritedPropertySheets="UpgradeFromVC70.vsprops"
398 UseOfMFC="0" 397 UseOfMFC="0"
@@ -412,13 +411,13 @@
412 /> 411 />
413 <Tool 412 <Tool
414 Name="VCMIDLTool" 413 Name="VCMIDLTool"
415 TargetEnvironment="2" 414 TargetEnvironment="3"
416 /> 415 />
417 <Tool 416 <Tool
418 Name="VCCLCompilerTool" 417 Name="VCCLCompilerTool"
419 InlineFunctionExpansion="1" 418 InlineFunctionExpansion="1"
420 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 419 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
421 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 420 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
422 StringPooling="true" 421 StringPooling="true"
423 ExceptionHandling="0" 422 ExceptionHandling="0"
424 RuntimeLibrary="2" 423 RuntimeLibrary="2"
@@ -443,7 +442,8 @@
443 /> 442 />
444 <Tool 443 <Tool
445 Name="VCLibrarianTool" 444 Name="VCLibrarianTool"
446 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" 445 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
446 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
447 OutputFile="$(OutDir)\zlibstat.lib" 447 OutputFile="$(OutDir)\zlibstat.lib"
448 SuppressStartupBanner="true" 448 SuppressStartupBanner="true"
449 /> 449 />
@@ -464,9 +464,9 @@
464 /> 464 />
465 </Configuration> 465 </Configuration>
466 <Configuration 466 <Configuration
467 Name="ReleaseWithoutAsm|Win32" 467 Name="Release|Itanium"
468 OutputDirectory="x86\ZlibStat$(ConfigurationName)" 468 OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
469 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" 469 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
470 ConfigurationType="4" 470 ConfigurationType="4"
471 InheritedPropertySheets="UpgradeFromVC70.vsprops" 471 InheritedPropertySheets="UpgradeFromVC70.vsprops"
472 UseOfMFC="0" 472 UseOfMFC="0"
@@ -486,15 +486,16 @@
486 /> 486 />
487 <Tool 487 <Tool
488 Name="VCMIDLTool" 488 Name="VCMIDLTool"
489 TargetEnvironment="2"
489 /> 490 />
490 <Tool 491 <Tool
491 Name="VCCLCompilerTool" 492 Name="VCCLCompilerTool"
492 InlineFunctionExpansion="1" 493 InlineFunctionExpansion="1"
493 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 494 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
494 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 495 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
495 StringPooling="true" 496 StringPooling="true"
496 ExceptionHandling="0" 497 ExceptionHandling="0"
497 RuntimeLibrary="0" 498 RuntimeLibrary="2"
498 BufferSecurityCheck="false" 499 BufferSecurityCheck="false"
499 EnableFunctionLevelLinking="true" 500 EnableFunctionLevelLinking="true"
500 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 501 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
@@ -516,7 +517,7 @@
516 /> 517 />
517 <Tool 518 <Tool
518 Name="VCLibrarianTool" 519 Name="VCLibrarianTool"
519 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" 520 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
520 OutputFile="$(OutDir)\zlibstat.lib" 521 OutputFile="$(OutDir)\zlibstat.lib"
521 SuppressStartupBanner="true" 522 SuppressStartupBanner="true"
522 /> 523 />
@@ -565,7 +566,7 @@
565 Name="VCCLCompilerTool" 566 Name="VCCLCompilerTool"
566 InlineFunctionExpansion="1" 567 InlineFunctionExpansion="1"
567 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 568 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
568 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 569 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
569 StringPooling="true" 570 StringPooling="true"
570 ExceptionHandling="0" 571 ExceptionHandling="0"
571 RuntimeLibrary="2" 572 RuntimeLibrary="2"
@@ -639,7 +640,7 @@
639 Name="VCCLCompilerTool" 640 Name="VCCLCompilerTool"
640 InlineFunctionExpansion="1" 641 InlineFunctionExpansion="1"
641 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 642 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
642 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 643 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
643 StringPooling="true" 644 StringPooling="true"
644 ExceptionHandling="0" 645 ExceptionHandling="0"
645 RuntimeLibrary="2" 646 RuntimeLibrary="2"
@@ -760,19 +761,24 @@
760 </FileConfiguration> 761 </FileConfiguration>
761 </File> 762 </File>
762 <File 763 <File
763 RelativePath="..\..\..\gzclose.c"> 764 RelativePath="..\..\..\gzclose.c"
765 >
764 </File> 766 </File>
765 <File 767 <File
766 RelativePath="..\..\..\gzio.c"> 768 RelativePath="..\..\..\gzio.c"
769 >
767 </File> 770 </File>
768 <File 771 <File
769 RelativePath="..\..\..\gzlib.c"> 772 RelativePath="..\..\..\gzlib.c"
773 >
770 </File> 774 </File>
771 <File 775 <File
772 RelativePath="..\..\..\gzread.c"> 776 RelativePath="..\..\..\gzread.c"
777 >
773 </File> 778 </File>
774 <File 779 <File
775 RelativePath="..\..\..\gzwrite.c"> 780 RelativePath="..\..\..\gzwrite.c"
781 >
776 </File> 782 </File>
777 <File 783 <File
778 RelativePath="..\..\..\infback.c" 784 RelativePath="..\..\..\infback.c"
@@ -790,7 +796,7 @@
790 /> 796 />
791 </FileConfiguration> 797 </FileConfiguration>
792 <FileConfiguration 798 <FileConfiguration
793 Name="Debug|Itanium" 799 Name="Release|Win32"
794 ExcludedFromBuild="true" 800 ExcludedFromBuild="true"
795 > 801 >
796 <Tool 802 <Tool
@@ -798,7 +804,7 @@
798 /> 804 />
799 </FileConfiguration> 805 </FileConfiguration>
800 <FileConfiguration 806 <FileConfiguration
801 Name="Release|Win32" 807 Name="ReleaseWithoutAsm|Win32"
802 ExcludedFromBuild="true" 808 ExcludedFromBuild="true"
803 > 809 >
804 <Tool 810 <Tool
@@ -806,7 +812,7 @@
806 /> 812 />
807 </FileConfiguration> 813 </FileConfiguration>
808 <FileConfiguration 814 <FileConfiguration
809 Name="Release|Itanium" 815 Name="Debug|Itanium"
810 ExcludedFromBuild="true" 816 ExcludedFromBuild="true"
811 > 817 >
812 <Tool 818 <Tool
@@ -814,7 +820,7 @@
814 /> 820 />
815 </FileConfiguration> 821 </FileConfiguration>
816 <FileConfiguration 822 <FileConfiguration
817 Name="ReleaseWithoutAsm|Win32" 823 Name="Release|Itanium"
818 ExcludedFromBuild="true" 824 ExcludedFromBuild="true"
819 > 825 >
820 <Tool 826 <Tool
diff --git a/contrib/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index de70122..0b6a9e9 100644
--- a/contrib/contrib/vstudio/vc8/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -93,3 +93,22 @@ EXPORTS
93 fill_win32_filefunc64 @111 93 fill_win32_filefunc64 @111
94 fill_win32_filefunc64A @112 94 fill_win32_filefunc64A @112
95 fill_win32_filefunc64W @113 95 fill_win32_filefunc64W @113
96
97; quick hack by hkuno@microhouse.co.jp
98 unzOpen64 @120
99 unzOpen2_64 @121
100 unzGetGlobalInfo64 @122
101 unzGetCurrentFileInfo64 @124
102 unzGetCurrentFileZStreamPos64 @125
103 unztell64 @126
104 unzGetFilePos64 @127
105 unzGoToFilePos64 @128
106
107 zipOpen64 @130
108 zipOpen2_64 @131
109 zipOpenNewFileInZip64 @132
110 zipOpenNewFileInZip2_64 @133
111 zipOpenNewFileInZip3_64 @134
112 zipOpenNewFileInZip4_64 @135
113 zipCloseFileInZipRaw64 @136
114; end hack
diff --git a/contrib/vstudio/vc8/zlibvc.sln b/contrib/vstudio/vc9/zlibvc.sln
index a815a55..c7f1b0b 100644
--- a/contrib/vstudio/vc8/zlibvc.sln
+++ b/contrib/vstudio/vc9/zlibvc.sln
@@ -1,6 +1,6 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 9.00 2Microsoft Visual Studio Solution File, Format Version 10.00
3# Visual Studio 2005 3# Visual Studio 2008
4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" 4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
5EndProject 5EndProject
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" 6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
diff --git a/contrib/contrib/vstudio/vc8/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj
index 91e966d..ee86786 100644
--- a/contrib/contrib/vstudio/vc8/zlibvc.vcproj
+++ b/contrib/vstudio/vc9/zlibvc.vcproj
@@ -1,9 +1,10 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="9.00"
5 Name="zlibvc" 5 Name="zlibvc"
6 ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}" 6 ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
7 TargetFrameworkVersion="131072"
7 > 8 >
8 <Platforms> 9 <Platforms>
9 <Platform 10 <Platform
@@ -52,7 +53,7 @@
52 Name="VCCLCompilerTool" 53 Name="VCCLCompilerTool"
53 Optimization="0" 54 Optimization="0"
54 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 55 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
55 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf,ASMV,ASMINF" 56 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
56 ExceptionHandling="0" 57 ExceptionHandling="0"
57 RuntimeLibrary="1" 58 RuntimeLibrary="1"
58 BufferSecurityCheck="false" 59 BufferSecurityCheck="false"
@@ -90,6 +91,8 @@
90 GenerateMapFile="true" 91 GenerateMapFile="true"
91 MapFileName="$(OutDir)/zlibwapi.map" 92 MapFileName="$(OutDir)/zlibwapi.map"
92 SubSystem="2" 93 SubSystem="2"
94 RandomizedBaseAddress="1"
95 DataExecutionPrevention="0"
93 ImportLibrary="$(OutDir)/zlibwapi.lib" 96 ImportLibrary="$(OutDir)/zlibwapi.lib"
94 /> 97 />
95 <Tool 98 <Tool
@@ -111,20 +114,18 @@
111 Name="VCAppVerifierTool" 114 Name="VCAppVerifierTool"
112 /> 115 />
113 <Tool 116 <Tool
114 Name="VCWebDeploymentTool"
115 />
116 <Tool
117 Name="VCPostBuildEventTool" 117 Name="VCPostBuildEventTool"
118 /> 118 />
119 </Configuration> 119 </Configuration>
120 <Configuration 120 <Configuration
121 Name="Debug|x64" 121 Name="ReleaseWithoutAsm|Win32"
122 OutputDirectory="x64\ZlibDll$(ConfigurationName)" 122 OutputDirectory="x86\ZlibDll$(ConfigurationName)"
123 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" 123 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
124 ConfigurationType="2" 124 ConfigurationType="2"
125 InheritedPropertySheets="UpgradeFromVC70.vsprops" 125 InheritedPropertySheets="UpgradeFromVC70.vsprops"
126 UseOfMFC="0" 126 UseOfMFC="0"
127 ATLMinimizesCRunTimeLibraryUsage="false" 127 ATLMinimizesCRunTimeLibraryUsage="false"
128 WholeProgramOptimization="1"
128 > 129 >
129 <Tool 130 <Tool
130 Name="VCPreBuildEventTool" 131 Name="VCPreBuildEventTool"
@@ -140,35 +141,37 @@
140 /> 141 />
141 <Tool 142 <Tool
142 Name="VCMIDLTool" 143 Name="VCMIDLTool"
143 PreprocessorDefinitions="_DEBUG" 144 PreprocessorDefinitions="NDEBUG"
144 MkTypLibCompatible="true" 145 MkTypLibCompatible="true"
145 SuppressStartupBanner="true" 146 SuppressStartupBanner="true"
146 TargetEnvironment="3" 147 TargetEnvironment="1"
147 TypeLibraryName="$(OutDir)/zlibvc.tlb" 148 TypeLibraryName="$(OutDir)/zlibvc.tlb"
148 /> 149 />
149 <Tool 150 <Tool
150 Name="VCCLCompilerTool" 151 Name="VCCLCompilerTool"
151 Optimization="0" 152 InlineFunctionExpansion="1"
152 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 153 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
153 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf,ASMV,ASMINF;WIN64" 154 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
155 StringPooling="true"
154 ExceptionHandling="0" 156 ExceptionHandling="0"
155 RuntimeLibrary="3" 157 RuntimeLibrary="2"
156 BufferSecurityCheck="false" 158 BufferSecurityCheck="false"
159 EnableFunctionLevelLinking="true"
157 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" 160 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
161 AssemblerOutput="2"
158 AssemblerListingLocation="$(IntDir)\" 162 AssemblerListingLocation="$(IntDir)\"
159 ObjectFile="$(IntDir)\" 163 ObjectFile="$(IntDir)\"
160 ProgramDataBaseFileName="$(OutDir)\" 164 ProgramDataBaseFileName="$(OutDir)\"
161 BrowseInformation="0" 165 BrowseInformation="0"
162 WarningLevel="3" 166 WarningLevel="3"
163 SuppressStartupBanner="true" 167 SuppressStartupBanner="true"
164 DebugInformationFormat="3"
165 /> 168 />
166 <Tool 169 <Tool
167 Name="VCManagedResourceCompilerTool" 170 Name="VCManagedResourceCompilerTool"
168 /> 171 />
169 <Tool 172 <Tool
170 Name="VCResourceCompilerTool" 173 Name="VCResourceCompilerTool"
171 PreprocessorDefinitions="_DEBUG" 174 PreprocessorDefinitions="NDEBUG"
172 Culture="1036" 175 Culture="1036"
173 /> 176 />
174 <Tool 177 <Tool
@@ -176,19 +179,21 @@
176 /> 179 />
177 <Tool 180 <Tool
178 Name="VCLinkerTool" 181 Name="VCLinkerTool"
179 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " 182 AdditionalOptions="/MACHINE:I386"
180 OutputFile="$(OutDir)\zlibwapi.dll" 183 OutputFile="$(OutDir)\zlibwapi.dll"
181 LinkIncremental="2" 184 LinkIncremental="1"
182 SuppressStartupBanner="true" 185 SuppressStartupBanner="true"
183 GenerateManifest="false" 186 GenerateManifest="false"
187 IgnoreAllDefaultLibraries="false"
184 ModuleDefinitionFile=".\zlibvc.def" 188 ModuleDefinitionFile=".\zlibvc.def"
185 GenerateDebugInformation="true"
186 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" 189 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
187 GenerateMapFile="true" 190 GenerateMapFile="true"
188 MapFileName="$(OutDir)/zlibwapi.map" 191 MapFileName="$(OutDir)/zlibwapi.map"
189 SubSystem="2" 192 SubSystem="2"
193 OptimizeForWindows98="1"
194 RandomizedBaseAddress="1"
195 DataExecutionPrevention="0"
190 ImportLibrary="$(OutDir)/zlibwapi.lib" 196 ImportLibrary="$(OutDir)/zlibwapi.lib"
191 TargetMachine="17"
192 /> 197 />
193 <Tool 198 <Tool
194 Name="VCALinkTool" 199 Name="VCALinkTool"
@@ -209,20 +214,18 @@
209 Name="VCAppVerifierTool" 214 Name="VCAppVerifierTool"
210 /> 215 />
211 <Tool 216 <Tool
212 Name="VCWebDeploymentTool"
213 />
214 <Tool
215 Name="VCPostBuildEventTool" 217 Name="VCPostBuildEventTool"
216 /> 218 />
217 </Configuration> 219 </Configuration>
218 <Configuration 220 <Configuration
219 Name="Debug|Itanium" 221 Name="Release|Win32"
220 OutputDirectory="ia64\ZlibDll$(ConfigurationName)" 222 OutputDirectory="x86\ZlibDll$(ConfigurationName)"
221 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" 223 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
222 ConfigurationType="2" 224 ConfigurationType="2"
223 InheritedPropertySheets="UpgradeFromVC70.vsprops" 225 InheritedPropertySheets="UpgradeFromVC70.vsprops"
224 UseOfMFC="0" 226 UseOfMFC="0"
225 ATLMinimizesCRunTimeLibraryUsage="false" 227 ATLMinimizesCRunTimeLibraryUsage="false"
228 WholeProgramOptimization="1"
226 > 229 >
227 <Tool 230 <Tool
228 Name="VCPreBuildEventTool" 231 Name="VCPreBuildEventTool"
@@ -238,35 +241,37 @@
238 /> 241 />
239 <Tool 242 <Tool
240 Name="VCMIDLTool" 243 Name="VCMIDLTool"
241 PreprocessorDefinitions="_DEBUG" 244 PreprocessorDefinitions="NDEBUG"
242 MkTypLibCompatible="true" 245 MkTypLibCompatible="true"
243 SuppressStartupBanner="true" 246 SuppressStartupBanner="true"
244 TargetEnvironment="2" 247 TargetEnvironment="1"
245 TypeLibraryName="$(OutDir)/zlibvc.tlb" 248 TypeLibraryName="$(OutDir)/zlibvc.tlb"
246 /> 249 />
247 <Tool 250 <Tool
248 Name="VCCLCompilerTool" 251 Name="VCCLCompilerTool"
249 Optimization="0" 252 InlineFunctionExpansion="1"
250 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 253 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
251 PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;WIN64" 254 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
255 StringPooling="true"
252 ExceptionHandling="0" 256 ExceptionHandling="0"
253 RuntimeLibrary="3" 257 RuntimeLibrary="2"
254 BufferSecurityCheck="false" 258 BufferSecurityCheck="false"
259 EnableFunctionLevelLinking="true"
255 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" 260 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
261 AssemblerOutput="2"
256 AssemblerListingLocation="$(IntDir)\" 262 AssemblerListingLocation="$(IntDir)\"
257 ObjectFile="$(IntDir)\" 263 ObjectFile="$(IntDir)\"
258 ProgramDataBaseFileName="$(OutDir)\" 264 ProgramDataBaseFileName="$(OutDir)\"
259 BrowseInformation="0" 265 BrowseInformation="0"
260 WarningLevel="3" 266 WarningLevel="3"
261 SuppressStartupBanner="true" 267 SuppressStartupBanner="true"
262 DebugInformationFormat="3"
263 /> 268 />
264 <Tool 269 <Tool
265 Name="VCManagedResourceCompilerTool" 270 Name="VCManagedResourceCompilerTool"
266 /> 271 />
267 <Tool 272 <Tool
268 Name="VCResourceCompilerTool" 273 Name="VCResourceCompilerTool"
269 PreprocessorDefinitions="_DEBUG" 274 PreprocessorDefinitions="NDEBUG"
270 Culture="1036" 275 Culture="1036"
271 /> 276 />
272 <Tool 277 <Tool
@@ -274,18 +279,22 @@
274 /> 279 />
275 <Tool 280 <Tool
276 Name="VCLinkerTool" 281 Name="VCLinkerTool"
282 AdditionalOptions="/MACHINE:I386"
283 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
277 OutputFile="$(OutDir)\zlibwapi.dll" 284 OutputFile="$(OutDir)\zlibwapi.dll"
278 LinkIncremental="2" 285 LinkIncremental="1"
279 SuppressStartupBanner="true" 286 SuppressStartupBanner="true"
280 GenerateManifest="false" 287 GenerateManifest="false"
288 IgnoreAllDefaultLibraries="false"
281 ModuleDefinitionFile=".\zlibvc.def" 289 ModuleDefinitionFile=".\zlibvc.def"
282 GenerateDebugInformation="true"
283 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" 290 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
284 GenerateMapFile="true" 291 GenerateMapFile="true"
285 MapFileName="$(OutDir)/zlibwapi.map" 292 MapFileName="$(OutDir)/zlibwapi.map"
286 SubSystem="2" 293 SubSystem="2"
294 OptimizeForWindows98="1"
295 RandomizedBaseAddress="1"
296 DataExecutionPrevention="0"
287 ImportLibrary="$(OutDir)/zlibwapi.lib" 297 ImportLibrary="$(OutDir)/zlibwapi.lib"
288 TargetMachine="5"
289 /> 298 />
290 <Tool 299 <Tool
291 Name="VCALinkTool" 300 Name="VCALinkTool"
@@ -306,21 +315,17 @@
306 Name="VCAppVerifierTool" 315 Name="VCAppVerifierTool"
307 /> 316 />
308 <Tool 317 <Tool
309 Name="VCWebDeploymentTool"
310 />
311 <Tool
312 Name="VCPostBuildEventTool" 318 Name="VCPostBuildEventTool"
313 /> 319 />
314 </Configuration> 320 </Configuration>
315 <Configuration 321 <Configuration
316 Name="ReleaseWithoutAsm|Win32" 322 Name="Debug|x64"
317 OutputDirectory="x86\ZlibDll$(ConfigurationName)" 323 OutputDirectory="x64\ZlibDll$(ConfigurationName)"
318 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" 324 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
319 ConfigurationType="2" 325 ConfigurationType="2"
320 InheritedPropertySheets="UpgradeFromVC70.vsprops" 326 InheritedPropertySheets="UpgradeFromVC70.vsprops"
321 UseOfMFC="0" 327 UseOfMFC="0"
322 ATLMinimizesCRunTimeLibraryUsage="false" 328 ATLMinimizesCRunTimeLibraryUsage="false"
323 WholeProgramOptimization="1"
324 > 329 >
325 <Tool 330 <Tool
326 Name="VCPreBuildEventTool" 331 Name="VCPreBuildEventTool"
@@ -336,37 +341,35 @@
336 /> 341 />
337 <Tool 342 <Tool
338 Name="VCMIDLTool" 343 Name="VCMIDLTool"
339 PreprocessorDefinitions="NDEBUG" 344 PreprocessorDefinitions="_DEBUG"
340 MkTypLibCompatible="true" 345 MkTypLibCompatible="true"
341 SuppressStartupBanner="true" 346 SuppressStartupBanner="true"
342 TargetEnvironment="1" 347 TargetEnvironment="3"
343 TypeLibraryName="$(OutDir)/zlibvc.tlb" 348 TypeLibraryName="$(OutDir)/zlibvc.tlb"
344 /> 349 />
345 <Tool 350 <Tool
346 Name="VCCLCompilerTool" 351 Name="VCCLCompilerTool"
347 InlineFunctionExpansion="1" 352 Optimization="0"
348 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 353 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
349 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf" 354 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
350 StringPooling="true"
351 ExceptionHandling="0" 355 ExceptionHandling="0"
352 RuntimeLibrary="2" 356 RuntimeLibrary="3"
353 BufferSecurityCheck="false" 357 BufferSecurityCheck="false"
354 EnableFunctionLevelLinking="true"
355 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" 358 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
356 AssemblerOutput="2"
357 AssemblerListingLocation="$(IntDir)\" 359 AssemblerListingLocation="$(IntDir)\"
358 ObjectFile="$(IntDir)\" 360 ObjectFile="$(IntDir)\"
359 ProgramDataBaseFileName="$(OutDir)\" 361 ProgramDataBaseFileName="$(OutDir)\"
360 BrowseInformation="0" 362 BrowseInformation="0"
361 WarningLevel="3" 363 WarningLevel="3"
362 SuppressStartupBanner="true" 364 SuppressStartupBanner="true"
365 DebugInformationFormat="3"
363 /> 366 />
364 <Tool 367 <Tool
365 Name="VCManagedResourceCompilerTool" 368 Name="VCManagedResourceCompilerTool"
366 /> 369 />
367 <Tool 370 <Tool
368 Name="VCResourceCompilerTool" 371 Name="VCResourceCompilerTool"
369 PreprocessorDefinitions="NDEBUG" 372 PreprocessorDefinitions="_DEBUG"
370 Culture="1036" 373 Culture="1036"
371 /> 374 />
372 <Tool 375 <Tool
@@ -374,19 +377,19 @@
374 /> 377 />
375 <Tool 378 <Tool
376 Name="VCLinkerTool" 379 Name="VCLinkerTool"
377 AdditionalOptions="/MACHINE:I386" 380 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
378 OutputFile="$(OutDir)\zlibwapi.dll" 381 OutputFile="$(OutDir)\zlibwapi.dll"
379 LinkIncremental="1" 382 LinkIncremental="2"
380 SuppressStartupBanner="true" 383 SuppressStartupBanner="true"
381 GenerateManifest="false" 384 GenerateManifest="false"
382 IgnoreAllDefaultLibraries="false"
383 ModuleDefinitionFile=".\zlibvc.def" 385 ModuleDefinitionFile=".\zlibvc.def"
386 GenerateDebugInformation="true"
384 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" 387 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
385 GenerateMapFile="true" 388 GenerateMapFile="true"
386 MapFileName="$(OutDir)/zlibwapi.map" 389 MapFileName="$(OutDir)/zlibwapi.map"
387 SubSystem="2" 390 SubSystem="2"
388 OptimizeForWindows98="1"
389 ImportLibrary="$(OutDir)/zlibwapi.lib" 391 ImportLibrary="$(OutDir)/zlibwapi.lib"
392 TargetMachine="17"
390 /> 393 />
391 <Tool 394 <Tool
392 Name="VCALinkTool" 395 Name="VCALinkTool"
@@ -414,14 +417,13 @@
414 /> 417 />
415 </Configuration> 418 </Configuration>
416 <Configuration 419 <Configuration
417 Name="ReleaseWithoutAsm|x64" 420 Name="Debug|Itanium"
418 OutputDirectory="x64\ZlibDll$(ConfigurationName)" 421 OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
419 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" 422 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
420 ConfigurationType="2" 423 ConfigurationType="2"
421 InheritedPropertySheets="UpgradeFromVC70.vsprops" 424 InheritedPropertySheets="UpgradeFromVC70.vsprops"
422 UseOfMFC="0" 425 UseOfMFC="0"
423 ATLMinimizesCRunTimeLibraryUsage="false" 426 ATLMinimizesCRunTimeLibraryUsage="false"
424 WholeProgramOptimization="1"
425 > 427 >
426 <Tool 428 <Tool
427 Name="VCPreBuildEventTool" 429 Name="VCPreBuildEventTool"
@@ -437,37 +439,35 @@
437 /> 439 />
438 <Tool 440 <Tool
439 Name="VCMIDLTool" 441 Name="VCMIDLTool"
440 PreprocessorDefinitions="NDEBUG" 442 PreprocessorDefinitions="_DEBUG"
441 MkTypLibCompatible="true" 443 MkTypLibCompatible="true"
442 SuppressStartupBanner="true" 444 SuppressStartupBanner="true"
443 TargetEnvironment="3" 445 TargetEnvironment="2"
444 TypeLibraryName="$(OutDir)/zlibvc.tlb" 446 TypeLibraryName="$(OutDir)/zlibvc.tlb"
445 /> 447 />
446 <Tool 448 <Tool
447 Name="VCCLCompilerTool" 449 Name="VCCLCompilerTool"
448 InlineFunctionExpansion="1" 450 Optimization="0"
449 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 451 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
450 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf;WIN64" 452 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
451 StringPooling="true"
452 ExceptionHandling="0" 453 ExceptionHandling="0"
453 RuntimeLibrary="2" 454 RuntimeLibrary="3"
454 BufferSecurityCheck="false" 455 BufferSecurityCheck="false"
455 EnableFunctionLevelLinking="true"
456 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" 456 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
457 AssemblerOutput="2"
458 AssemblerListingLocation="$(IntDir)\" 457 AssemblerListingLocation="$(IntDir)\"
459 ObjectFile="$(IntDir)\" 458 ObjectFile="$(IntDir)\"
460 ProgramDataBaseFileName="$(OutDir)\" 459 ProgramDataBaseFileName="$(OutDir)\"
461 BrowseInformation="0" 460 BrowseInformation="0"
462 WarningLevel="3" 461 WarningLevel="3"
463 SuppressStartupBanner="true" 462 SuppressStartupBanner="true"
463 DebugInformationFormat="3"
464 /> 464 />
465 <Tool 465 <Tool
466 Name="VCManagedResourceCompilerTool" 466 Name="VCManagedResourceCompilerTool"
467 /> 467 />
468 <Tool 468 <Tool
469 Name="VCResourceCompilerTool" 469 Name="VCResourceCompilerTool"
470 PreprocessorDefinitions="NDEBUG" 470 PreprocessorDefinitions="_DEBUG"
471 Culture="1036" 471 Culture="1036"
472 /> 472 />
473 <Tool 473 <Tool
@@ -476,18 +476,17 @@
476 <Tool 476 <Tool
477 Name="VCLinkerTool" 477 Name="VCLinkerTool"
478 OutputFile="$(OutDir)\zlibwapi.dll" 478 OutputFile="$(OutDir)\zlibwapi.dll"
479 LinkIncremental="1" 479 LinkIncremental="2"
480 SuppressStartupBanner="true" 480 SuppressStartupBanner="true"
481 GenerateManifest="false" 481 GenerateManifest="false"
482 IgnoreAllDefaultLibraries="false"
483 ModuleDefinitionFile=".\zlibvc.def" 482 ModuleDefinitionFile=".\zlibvc.def"
483 GenerateDebugInformation="true"
484 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" 484 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
485 GenerateMapFile="true" 485 GenerateMapFile="true"
486 MapFileName="$(OutDir)/zlibwapi.map" 486 MapFileName="$(OutDir)/zlibwapi.map"
487 SubSystem="2" 487 SubSystem="2"
488 OptimizeForWindows98="1"
489 ImportLibrary="$(OutDir)/zlibwapi.lib" 488 ImportLibrary="$(OutDir)/zlibwapi.lib"
490 TargetMachine="17" 489 TargetMachine="5"
491 /> 490 />
492 <Tool 491 <Tool
493 Name="VCALinkTool" 492 Name="VCALinkTool"
@@ -515,9 +514,9 @@
515 /> 514 />
516 </Configuration> 515 </Configuration>
517 <Configuration 516 <Configuration
518 Name="ReleaseWithoutAsm|Itanium" 517 Name="ReleaseWithoutAsm|x64"
519 OutputDirectory="ia64\ZlibDll$(ConfigurationName)" 518 OutputDirectory="x64\ZlibDll$(ConfigurationName)"
520 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" 519 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
521 ConfigurationType="2" 520 ConfigurationType="2"
522 InheritedPropertySheets="UpgradeFromVC70.vsprops" 521 InheritedPropertySheets="UpgradeFromVC70.vsprops"
523 UseOfMFC="0" 522 UseOfMFC="0"
@@ -541,14 +540,14 @@
541 PreprocessorDefinitions="NDEBUG" 540 PreprocessorDefinitions="NDEBUG"
542 MkTypLibCompatible="true" 541 MkTypLibCompatible="true"
543 SuppressStartupBanner="true" 542 SuppressStartupBanner="true"
544 TargetEnvironment="2" 543 TargetEnvironment="3"
545 TypeLibraryName="$(OutDir)/zlibvc.tlb" 544 TypeLibraryName="$(OutDir)/zlibvc.tlb"
546 /> 545 />
547 <Tool 546 <Tool
548 Name="VCCLCompilerTool" 547 Name="VCCLCompilerTool"
549 InlineFunctionExpansion="1" 548 InlineFunctionExpansion="1"
550 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 549 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
551 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf;WIN64" 550 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
552 StringPooling="true" 551 StringPooling="true"
553 ExceptionHandling="0" 552 ExceptionHandling="0"
554 RuntimeLibrary="2" 553 RuntimeLibrary="2"
@@ -588,7 +587,7 @@
588 SubSystem="2" 587 SubSystem="2"
589 OptimizeForWindows98="1" 588 OptimizeForWindows98="1"
590 ImportLibrary="$(OutDir)/zlibwapi.lib" 589 ImportLibrary="$(OutDir)/zlibwapi.lib"
591 TargetMachine="5" 590 TargetMachine="17"
592 /> 591 />
593 <Tool 592 <Tool
594 Name="VCALinkTool" 593 Name="VCALinkTool"
@@ -616,9 +615,9 @@
616 /> 615 />
617 </Configuration> 616 </Configuration>
618 <Configuration 617 <Configuration
619 Name="Release|Win32" 618 Name="ReleaseWithoutAsm|Itanium"
620 OutputDirectory="x86\ZlibDll$(ConfigurationName)" 619 OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
621 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" 620 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
622 ConfigurationType="2" 621 ConfigurationType="2"
623 InheritedPropertySheets="UpgradeFromVC70.vsprops" 622 InheritedPropertySheets="UpgradeFromVC70.vsprops"
624 UseOfMFC="0" 623 UseOfMFC="0"
@@ -642,14 +641,14 @@
642 PreprocessorDefinitions="NDEBUG" 641 PreprocessorDefinitions="NDEBUG"
643 MkTypLibCompatible="true" 642 MkTypLibCompatible="true"
644 SuppressStartupBanner="true" 643 SuppressStartupBanner="true"
645 TargetEnvironment="1" 644 TargetEnvironment="2"
646 TypeLibraryName="$(OutDir)/zlibvc.tlb" 645 TypeLibraryName="$(OutDir)/zlibvc.tlb"
647 /> 646 />
648 <Tool 647 <Tool
649 Name="VCCLCompilerTool" 648 Name="VCCLCompilerTool"
650 InlineFunctionExpansion="1" 649 InlineFunctionExpansion="1"
651 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 650 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
652 PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;ASMV;ASMINF" 651 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
653 StringPooling="true" 652 StringPooling="true"
654 ExceptionHandling="0" 653 ExceptionHandling="0"
655 RuntimeLibrary="2" 654 RuntimeLibrary="2"
@@ -677,8 +676,6 @@
677 /> 676 />
678 <Tool 677 <Tool
679 Name="VCLinkerTool" 678 Name="VCLinkerTool"
680 AdditionalOptions="/MACHINE:I386"
681 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
682 OutputFile="$(OutDir)\zlibwapi.dll" 679 OutputFile="$(OutDir)\zlibwapi.dll"
683 LinkIncremental="1" 680 LinkIncremental="1"
684 SuppressStartupBanner="true" 681 SuppressStartupBanner="true"
@@ -691,6 +688,7 @@
691 SubSystem="2" 688 SubSystem="2"
692 OptimizeForWindows98="1" 689 OptimizeForWindows98="1"
693 ImportLibrary="$(OutDir)/zlibwapi.lib" 690 ImportLibrary="$(OutDir)/zlibwapi.lib"
691 TargetMachine="5"
694 /> 692 />
695 <Tool 693 <Tool
696 Name="VCALinkTool" 694 Name="VCALinkTool"
@@ -751,7 +749,7 @@
751 Name="VCCLCompilerTool" 749 Name="VCCLCompilerTool"
752 InlineFunctionExpansion="1" 750 InlineFunctionExpansion="1"
753 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 751 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
754 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;ASMV;ASMINF;WIN64" 752 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
755 StringPooling="true" 753 StringPooling="true"
756 ExceptionHandling="0" 754 ExceptionHandling="0"
757 RuntimeLibrary="2" 755 RuntimeLibrary="2"
@@ -853,7 +851,7 @@
853 Name="VCCLCompilerTool" 851 Name="VCCLCompilerTool"
854 InlineFunctionExpansion="1" 852 InlineFunctionExpansion="1"
855 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 853 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
856 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;WIN64" 854 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
857 StringPooling="true" 855 StringPooling="true"
858 ExceptionHandling="0" 856 ExceptionHandling="0"
859 RuntimeLibrary="2" 857 RuntimeLibrary="2"
@@ -948,7 +946,7 @@
948 RelativePath="..\..\masmx86\gvmat32c.c" 946 RelativePath="..\..\masmx86\gvmat32c.c"
949 > 947 >
950 <FileConfiguration 948 <FileConfiguration
951 Name="Debug|x64" 949 Name="ReleaseWithoutAsm|Win32"
952 ExcludedFromBuild="true" 950 ExcludedFromBuild="true"
953 > 951 >
954 <Tool 952 <Tool
@@ -956,7 +954,7 @@
956 /> 954 />
957 </FileConfiguration> 955 </FileConfiguration>
958 <FileConfiguration 956 <FileConfiguration
959 Name="Debug|Itanium" 957 Name="Debug|x64"
960 ExcludedFromBuild="true" 958 ExcludedFromBuild="true"
961 > 959 >
962 <Tool 960 <Tool
@@ -964,7 +962,7 @@
964 /> 962 />
965 </FileConfiguration> 963 </FileConfiguration>
966 <FileConfiguration 964 <FileConfiguration
967 Name="ReleaseWithoutAsm|Win32" 965 Name="Debug|Itanium"
968 ExcludedFromBuild="true" 966 ExcludedFromBuild="true"
969 > 967 >
970 <Tool 968 <Tool
@@ -1005,19 +1003,24 @@
1005 </FileConfiguration> 1003 </FileConfiguration>
1006 </File> 1004 </File>
1007 <File 1005 <File
1008 RelativePath="..\..\..\gzclose.c"> 1006 RelativePath="..\..\..\gzclose.c"
1007 >
1009 </File> 1008 </File>
1010 <File 1009 <File
1011 RelativePath="..\..\..\gzio.c"> 1010 RelativePath="..\..\..\gzio.c"
1011 >
1012 </File> 1012 </File>
1013 <File 1013 <File
1014 RelativePath="..\..\..\gzlib.c"> 1014 RelativePath="..\..\..\gzlib.c"
1015 >
1015 </File> 1016 </File>
1016 <File 1017 <File
1017 RelativePath="..\..\..\gzread.c"> 1018 RelativePath="..\..\..\gzread.c"
1019 >
1018 </File> 1020 </File>
1019 <File 1021 <File
1020 RelativePath="..\..\..\gzwrite.c"> 1022 RelativePath="..\..\..\gzwrite.c"
1023 >
1021 </File> 1024 </File>
1022 <File 1025 <File
1023 RelativePath="..\..\..\infback.c" 1026 RelativePath="..\..\..\infback.c"
@@ -1035,7 +1038,7 @@
1035 /> 1038 />
1036 </FileConfiguration> 1039 </FileConfiguration>
1037 <FileConfiguration 1040 <FileConfiguration
1038 Name="Debug|Itanium" 1041 Name="ReleaseWithoutAsm|Win32"
1039 ExcludedFromBuild="true" 1042 ExcludedFromBuild="true"
1040 > 1043 >
1041 <Tool 1044 <Tool
@@ -1043,7 +1046,7 @@
1043 /> 1046 />
1044 </FileConfiguration> 1047 </FileConfiguration>
1045 <FileConfiguration 1048 <FileConfiguration
1046 Name="ReleaseWithoutAsm|Win32" 1049 Name="Release|Win32"
1047 ExcludedFromBuild="true" 1050 ExcludedFromBuild="true"
1048 > 1051 >
1049 <Tool 1052 <Tool
@@ -1051,7 +1054,7 @@
1051 /> 1054 />
1052 </FileConfiguration> 1055 </FileConfiguration>
1053 <FileConfiguration 1056 <FileConfiguration
1054 Name="ReleaseWithoutAsm|Itanium" 1057 Name="Debug|Itanium"
1055 ExcludedFromBuild="true" 1058 ExcludedFromBuild="true"
1056 > 1059 >
1057 <Tool 1060 <Tool
@@ -1059,7 +1062,7 @@
1059 /> 1062 />
1060 </FileConfiguration> 1063 </FileConfiguration>
1061 <FileConfiguration 1064 <FileConfiguration
1062 Name="Release|Win32" 1065 Name="ReleaseWithoutAsm|Itanium"
1063 ExcludedFromBuild="true" 1066 ExcludedFromBuild="true"
1064 > 1067 >
1065 <Tool 1068 <Tool
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 07:54:18 +0000