diff options
Diffstat (limited to '')
| -rw-r--r-- | contrib/vstudio/vc9/zlibvc.vcproj (renamed from contrib/contrib/vstudio/vc8/zlibvc.vcproj) | 201 |
1 files changed, 102 insertions, 99 deletions
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 |