aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/vstudio/readme.txt14
-rw-r--r--contrib/vstudio/vc10/testzlibdll.vcxproj12
-rw-r--r--contrib/vstudio/vc10/zlib.rc4
-rw-r--r--contrib/vstudio/vc10/zlibvc.def5
-rw-r--r--contrib/vstudio/vc10/zlibvc.vcxproj22
-rw-r--r--contrib/vstudio/vc9/zlib.rc4
-rw-r--r--contrib/vstudio/vc9/zlibvc.def3
7 files changed, 44 insertions, 20 deletions
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 904888b..59c8b8b 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,8 +1,8 @@
1Building instructions for the DLL versions of Zlib 1.2.4 1Building instructions for the DLL versions of Zlib 1.2.7
2======================================================== 2========================================================
3 3
4This directory contains projects that build zlib and minizip using 4This directory contains projects that build zlib and minizip using
5Microsoft Visual C++ 9.0/10.0, and Visual C++ . 5Microsoft Visual C++ 9.0/10.0.
6 6
7You don't need to build these projects yourself. You can download the 7You don't need to build these projects yourself. You can download the
8binaries from: 8binaries from:
@@ -10,9 +10,6 @@ binaries from:
10 10
11More information can be found at this site. 11More information can be found at this site.
12 12
13first compile assembly code by running
14bld_ml64.bat in contrib\masmx64
15bld_ml32.bat in contrib\masmx86
16 13
17 14
18 15
@@ -20,13 +17,16 @@ bld_ml32.bat in contrib\masmx86
20Build instructions for Visual Studio 2008 (32 bits or 64 bits) 17Build instructions for Visual Studio 2008 (32 bits or 64 bits)
21-------------------------------------------------------------- 18--------------------------------------------------------------
22- Uncompress current zlib, including all contrib/* files 19- Uncompress current zlib, including all contrib/* files
23- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0 20- Compile assembly code (with Visual Studio Command Prompt) by running:
21 bld_ml64.bat (in contrib\masmx64)
22 bld_ml32.bat (in contrib\masmx86)
23- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
24- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32" 24- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
25 25
26Build instructions for Visual Studio 2010 (32 bits or 64 bits) 26Build instructions for Visual Studio 2010 (32 bits or 64 bits)
27-------------------------------------------------------------- 27--------------------------------------------------------------
28- Uncompress current zlib, including all contrib/* files 28- Uncompress current zlib, including all contrib/* files
29- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0 29- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
30 30
31 31
32Important 32Important
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj b/contrib/vstudio/vc10/testzlibdll.vcxproj
index 2d62815..bcb08ff 100644
--- a/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ b/contrib/vstudio/vc10/testzlibdll.vcxproj
@@ -139,7 +139,7 @@
139 </ClCompile> 139 </ClCompile>
140 <Link> 140 <Link>
141 <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 141 <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
142 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 142 <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
143 <GenerateDebugInformation>true</GenerateDebugInformation> 143 <GenerateDebugInformation>true</GenerateDebugInformation>
144 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 144 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
145 <SubSystem>Console</SubSystem> 145 <SubSystem>Console</SubSystem>
@@ -169,7 +169,7 @@
169 </ClCompile> 169 </ClCompile>
170 <Link> 170 <Link>
171 <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 171 <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
172 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 172 <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
173 <GenerateDebugInformation>true</GenerateDebugInformation> 173 <GenerateDebugInformation>true</GenerateDebugInformation>
174 <SubSystem>Console</SubSystem> 174 <SubSystem>Console</SubSystem>
175 <OptimizeReferences>true</OptimizeReferences> 175 <OptimizeReferences>true</OptimizeReferences>
@@ -200,7 +200,7 @@
200 </ClCompile> 200 </ClCompile>
201 <Link> 201 <Link>
202 <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 202 <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
203 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 203 <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
204 <GenerateDebugInformation>true</GenerateDebugInformation> 204 <GenerateDebugInformation>true</GenerateDebugInformation>
205 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 205 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
206 <SubSystem>Console</SubSystem> 206 <SubSystem>Console</SubSystem>
@@ -227,7 +227,7 @@
227 </ClCompile> 227 </ClCompile>
228 <Link> 228 <Link>
229 <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 229 <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
230 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 230 <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
231 <GenerateDebugInformation>true</GenerateDebugInformation> 231 <GenerateDebugInformation>true</GenerateDebugInformation>
232 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 232 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
233 <SubSystem>Console</SubSystem> 233 <SubSystem>Console</SubSystem>
@@ -257,7 +257,7 @@
257 </ClCompile> 257 </ClCompile>
258 <Link> 258 <Link>
259 <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 259 <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
260 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 260 <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
261 <GenerateDebugInformation>true</GenerateDebugInformation> 261 <GenerateDebugInformation>true</GenerateDebugInformation>
262 <SubSystem>Console</SubSystem> 262 <SubSystem>Console</SubSystem>
263 <OptimizeReferences>true</OptimizeReferences> 263 <OptimizeReferences>true</OptimizeReferences>
@@ -288,7 +288,7 @@
288 </ClCompile> 288 </ClCompile>
289 <Link> 289 <Link>
290 <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 290 <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
291 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 291 <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
292 <GenerateDebugInformation>true</GenerateDebugInformation> 292 <GenerateDebugInformation>true</GenerateDebugInformation>
293 <SubSystem>Console</SubSystem> 293 <SubSystem>Console</SubSystem>
294 <OptimizeReferences>true</OptimizeReferences> 294 <OptimizeReferences>true</OptimizeReferences>
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 9c71a6a..8eca4db 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/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.7,1 5 FILEVERSION 1.2.7,0
6 PRODUCTVERSION 1.2.7,1 6 PRODUCTVERSION 1.2.7,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
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index b4bb8f6..d39a1d2 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.24 4VERSION 1.2.7
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
@@ -132,5 +132,6 @@ EXPORTS
132 132
133; zlib1 v1.2.6 added: 133; zlib1 v1.2.6 added:
134 gzgetc_ @161 134 gzgetc_ @161
135 gzflags @162
135 inflateResetKeep @163 136 inflateResetKeep @163
136 deflateResetKeep @164 137 deflateResetKeep @164
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 9862398..9218fdc 100644
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -180,6 +180,12 @@
180 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> 180 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
181 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 181 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
182 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 182 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
183 <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
184 <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
185 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
186 <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
187 <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
188 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
183 </PropertyGroup> 189 </PropertyGroup>
184 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 190 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
185 <Midl> 191 <Midl>
@@ -227,6 +233,10 @@
227 </DataExecutionPrevention> 233 </DataExecutionPrevention>
228 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 234 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
229 </Link> 235 </Link>
236 <PreBuildEvent>
237 <Command>cd ..\..\masmx86
238bld_ml32.bat</Command>
239 </PreBuildEvent>
230 </ItemDefinitionGroup> 240 </ItemDefinitionGroup>
231 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 241 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
232 <Midl> 242 <Midl>
@@ -324,6 +334,10 @@
324 </DataExecutionPrevention> 334 </DataExecutionPrevention>
325 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 335 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
326 </Link> 336 </Link>
337 <PreBuildEvent>
338 <Command>cd ..\..\masmx86
339bld_ml32.bat</Command>
340 </PreBuildEvent>
327 </ItemDefinitionGroup> 341 </ItemDefinitionGroup>
328 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 342 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
329 <Midl> 343 <Midl>
@@ -368,6 +382,10 @@
368 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 382 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
369 <TargetMachine>MachineX64</TargetMachine> 383 <TargetMachine>MachineX64</TargetMachine>
370 </Link> 384 </Link>
385 <PreBuildEvent>
386 <Command>cd ..\..\contrib\masmx64
387bld_ml64.bat</Command>
388 </PreBuildEvent>
371 </ItemDefinitionGroup> 389 </ItemDefinitionGroup>
372 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 390 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
373 <Midl> 391 <Midl>
@@ -547,6 +565,10 @@
547 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 565 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
548 <TargetMachine>MachineX64</TargetMachine> 566 <TargetMachine>MachineX64</TargetMachine>
549 </Link> 567 </Link>
568 <PreBuildEvent>
569 <Command>cd ..\..\masmx64
570bld_ml64.bat</Command>
571 </PreBuildEvent>
550 </ItemDefinitionGroup> 572 </ItemDefinitionGroup>
551 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 573 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
552 <Midl> 574 <Midl>
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 9c71a6a..8eca4db 100644
--- a/contrib/vstudio/vc9/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.7,1 5 FILEVERSION 1.2.7,0
6 PRODUCTVERSION 1.2.7,1 6 PRODUCTVERSION 1.2.7,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
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index b4bb8f6..0c6d774 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.24 4VERSION 1.2.7
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
@@ -132,5 +132,6 @@ EXPORTS
132 132
133; zlib1 v1.2.6 added: 133; zlib1 v1.2.6 added:
134 gzgetc_ @161 134 gzgetc_ @161
135 gzflags @162
135 inflateResetKeep @163 136 inflateResetKeep @163
136 deflateResetKeep @164 137 deflateResetKeep @164
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-31 03:35:02 +0000