summaryrefslogtreecommitdiff
path: root/contrib/vstudio/vc7
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:25:17 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:25:17 -0700
commitabf180a067223611620dd97dd5681df7c7fa7c9b (patch)
tree48ce6022aa1670380c098bd0abed2ac4aa1d9ca0 /contrib/vstudio/vc7
parent9c3a5830218c4e7fff23b8fc4386269db77a03a9 (diff)
downloadzlib-1.2.3.tar.gz
zlib-1.2.3.tar.bz2
zlib-1.2.3.zip
zlib 1.2.3v1.2.3
Diffstat (limited to 'contrib/vstudio/vc7')
-rw-r--r--contrib/vstudio/vc7/gvmat32.objbin10241 -> 0 bytes
-rw-r--r--contrib/vstudio/vc7/inffas32.objbin14893 -> 0 bytes
-rw-r--r--contrib/vstudio/vc7/miniunz.vcproj6
-rw-r--r--contrib/vstudio/vc7/minizip.vcproj6
-rw-r--r--contrib/vstudio/vc7/testzlib.vcproj126
-rw-r--r--contrib/vstudio/vc7/zlib.rc6
-rw-r--r--contrib/vstudio/vc7/zlibstat.vcproj38
-rw-r--r--contrib/vstudio/vc7/zlibvc.def4
-rw-r--r--contrib/vstudio/vc7/zlibvc.sln12
-rw-r--r--contrib/vstudio/vc7/zlibvc.vcproj75
10 files changed, 214 insertions, 59 deletions
diff --git a/contrib/vstudio/vc7/gvmat32.obj b/contrib/vstudio/vc7/gvmat32.obj
deleted file mode 100644
index ebb32623..00000000
--- a/contrib/vstudio/vc7/gvmat32.obj
+++ /dev/null
Binary files differ
diff --git a/contrib/vstudio/vc7/inffas32.obj b/contrib/vstudio/vc7/inffas32.obj
deleted file mode 100644
index bd6664d1..00000000
--- a/contrib/vstudio/vc7/inffas32.obj
+++ /dev/null
Binary files differ
diff --git a/contrib/vstudio/vc7/miniunz.vcproj b/contrib/vstudio/vc7/miniunz.vcproj
index 935c250e..ad5117c8 100644
--- a/contrib/vstudio/vc7/miniunz.vcproj
+++ b/contrib/vstudio/vc7/miniunz.vcproj
@@ -19,6 +19,7 @@
19 <Tool 19 <Tool
20 Name="VCCLCompilerTool" 20 Name="VCCLCompilerTool"
21 Optimization="0" 21 Optimization="0"
22 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
22 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE" 23 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"
23 MinimalRebuild="TRUE" 24 MinimalRebuild="TRUE"
24 BasicRuntimeChecks="3" 25 BasicRuntimeChecks="3"
@@ -63,6 +64,7 @@
63 Optimization="2" 64 Optimization="2"
64 InlineFunctionExpansion="1" 65 InlineFunctionExpansion="1"
65 OmitFramePointers="TRUE" 66 OmitFramePointers="TRUE"
67 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
66 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE" 68 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"
67 StringPooling="TRUE" 69 StringPooling="TRUE"
68 RuntimeLibrary="4" 70 RuntimeLibrary="4"
@@ -104,7 +106,7 @@
104 Name="Source Files" 106 Name="Source Files"
105 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> 107 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
106 <File 108 <File
107 RelativePath="miniunz.c"> 109 RelativePath="..\..\minizip\miniunz.c">
108 </File> 110 </File>
109 </Filter> 111 </Filter>
110 <Filter 112 <Filter
@@ -116,7 +118,7 @@
116 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> 118 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
117 </Filter> 119 </Filter>
118 <File 120 <File
119 RelativePath="zlibwapi.lib"> 121 RelativePath="ReleaseDll\zlibwapi.lib">
120 </File> 122 </File>
121 </Files> 123 </Files>
122 <Globals> 124 <Globals>
diff --git a/contrib/vstudio/vc7/minizip.vcproj b/contrib/vstudio/vc7/minizip.vcproj
index e6f91074..fb5b6320 100644
--- a/contrib/vstudio/vc7/minizip.vcproj
+++ b/contrib/vstudio/vc7/minizip.vcproj
@@ -19,6 +19,7 @@
19 <Tool 19 <Tool
20 Name="VCCLCompilerTool" 20 Name="VCCLCompilerTool"
21 Optimization="0" 21 Optimization="0"
22 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
22 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE" 23 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"
23 MinimalRebuild="TRUE" 24 MinimalRebuild="TRUE"
24 BasicRuntimeChecks="3" 25 BasicRuntimeChecks="3"
@@ -63,6 +64,7 @@
63 Optimization="2" 64 Optimization="2"
64 InlineFunctionExpansion="1" 65 InlineFunctionExpansion="1"
65 OmitFramePointers="TRUE" 66 OmitFramePointers="TRUE"
67 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
66 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE" 68 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"
67 StringPooling="TRUE" 69 StringPooling="TRUE"
68 RuntimeLibrary="4" 70 RuntimeLibrary="4"
@@ -104,7 +106,7 @@
104 Name="Source Files" 106 Name="Source Files"
105 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> 107 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
106 <File 108 <File
107 RelativePath="minizip.c"> 109 RelativePath="..\..\minizip\minizip.c">
108 </File> 110 </File>
109 </Filter> 111 </Filter>
110 <Filter 112 <Filter
@@ -116,7 +118,7 @@
116 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> 118 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
117 </Filter> 119 </Filter>
118 <File 120 <File
119 RelativePath="zlibwapi.lib"> 121 RelativePath="ReleaseDll\zlibwapi.lib">
120 </File> 122 </File>
121 </Files> 123 </Files>
122 <Globals> 124 <Globals>
diff --git a/contrib/vstudio/vc7/testzlib.vcproj b/contrib/vstudio/vc7/testzlib.vcproj
new file mode 100644
index 00000000..97bc3e8c
--- /dev/null
+++ b/contrib/vstudio/vc7/testzlib.vcproj
@@ -0,0 +1,126 @@
1<?xml version="1.0" encoding = "Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="7.00"
5 Name="testZlibDll"
6 ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"
7 Keyword="Win32Proj">
8 <Platforms>
9 <Platform
10 Name="Win32"/>
11 </Platforms>
12 <Configurations>
13 <Configuration
14 Name="Debug|Win32"
15 OutputDirectory="Debug"
16 IntermediateDirectory="Debug"
17 ConfigurationType="1"
18 CharacterSet="2">
19 <Tool
20 Name="VCCLCompilerTool"
21 Optimization="0"
22 AdditionalIncludeDirectories="..\..\.."
23 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"
24 MinimalRebuild="TRUE"
25 BasicRuntimeChecks="3"
26 RuntimeLibrary="5"
27 UsePrecompiledHeader="0"
28 WarningLevel="3"
29 Detect64BitPortabilityProblems="TRUE"
30 DebugInformationFormat="4"/>
31 <Tool
32 Name="VCCustomBuildTool"/>
33 <Tool
34 Name="VCLinkerTool"
35 OutputFile="$(OutDir)/testzlib.exe"
36 LinkIncremental="2"
37 GenerateDebugInformation="TRUE"
38 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
39 SubSystem="1"
40 TargetMachine="1"/>
41 <Tool
42 Name="VCMIDLTool"/>
43 <Tool
44 Name="VCPostBuildEventTool"/>
45 <Tool
46 Name="VCPreBuildEventTool"/>
47 <Tool
48 Name="VCPreLinkEventTool"/>
49 <Tool
50 Name="VCResourceCompilerTool"/>
51 <Tool
52 Name="VCWebServiceProxyGeneratorTool"/>
53 <Tool
54 Name="VCWebDeploymentTool"/>
55 </Configuration>
56 <Configuration
57 Name="Release|Win32"
58 OutputDirectory="Release"
59 IntermediateDirectory="Release"
60 ConfigurationType="1"
61 CharacterSet="2">
62 <Tool
63 Name="VCCLCompilerTool"
64 Optimization="2"
65 InlineFunctionExpansion="1"
66 OmitFramePointers="TRUE"
67 AdditionalIncludeDirectories="..\..\.."
68 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"
69 StringPooling="TRUE"
70 RuntimeLibrary="4"
71 EnableFunctionLevelLinking="TRUE"
72 UsePrecompiledHeader="0"
73 WarningLevel="3"
74 Detect64BitPortabilityProblems="TRUE"
75 DebugInformationFormat="3"/>
76 <Tool
77 Name="VCCustomBuildTool"/>
78 <Tool
79 Name="VCLinkerTool"
80 OutputFile="$(OutDir)/testzlib.exe"
81 LinkIncremental="1"
82 GenerateDebugInformation="TRUE"
83 SubSystem="1"
84 OptimizeReferences="2"
85 EnableCOMDATFolding="2"
86 OptimizeForWindows98="1"
87 TargetMachine="1"/>
88 <Tool
89 Name="VCMIDLTool"/>
90 <Tool
91 Name="VCPostBuildEventTool"/>
92 <Tool
93 Name="VCPreBuildEventTool"/>
94 <Tool
95 Name="VCPreLinkEventTool"/>
96 <Tool
97 Name="VCResourceCompilerTool"/>
98 <Tool
99 Name="VCWebServiceProxyGeneratorTool"/>
100 <Tool
101 Name="VCWebDeploymentTool"/>
102 </Configuration>
103 </Configurations>
104 <Files>
105 <Filter
106 Name="Source Files"
107 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
108 <File
109 RelativePath="..\..\testzlib\testzlib.c">
110 </File>
111 </Filter>
112 <Filter
113 Name="Header Files"
114 Filter="h;hpp;hxx;hm;inl;inc">
115 </Filter>
116 <Filter
117 Name="Resource Files"
118 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
119 </Filter>
120 <File
121 RelativePath="ReleaseDll\zlibwapi.lib">
122 </File>
123 </Files>
124 <Globals>
125 </Globals>
126</VisualStudioProject>
diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc7/zlib.rc
index e9d748f4..72cb8b4c 100644
--- a/contrib/vstudio/vc7/zlib.rc
+++ b/contrib/vstudio/vc7/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,2,4 5 FILEVERSION 1,2,3,0
6 PRODUCTVERSION 1,2,2,4 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,7 +17,7 @@ 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.2.4\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"
diff --git a/contrib/vstudio/vc7/zlibstat.vcproj b/contrib/vstudio/vc7/zlibstat.vcproj
index eb182f7a..766d7a4d 100644
--- a/contrib/vstudio/vc7/zlibstat.vcproj
+++ b/contrib/vstudio/vc7/zlibstat.vcproj
@@ -20,6 +20,7 @@
20 <Tool 20 <Tool
21 Name="VCCLCompilerTool" 21 Name="VCCLCompilerTool"
22 Optimization="0" 22 Optimization="0"
23 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
23 PreprocessorDefinitions="WIN32;ZLIB_WINAPI" 24 PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
24 ExceptionHandling="FALSE" 25 ExceptionHandling="FALSE"
25 RuntimeLibrary="5" 26 RuntimeLibrary="5"
@@ -61,6 +62,7 @@
61 <Tool 62 <Tool
62 Name="VCCLCompilerTool" 63 Name="VCCLCompilerTool"
63 InlineFunctionExpansion="1" 64 InlineFunctionExpansion="1"
65 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
64 PreprocessorDefinitions="WIN32;ZLIB_WINAPI" 66 PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
65 StringPooling="TRUE" 67 StringPooling="TRUE"
66 ExceptionHandling="FALSE" 68 ExceptionHandling="FALSE"
@@ -102,6 +104,7 @@
102 <Tool 104 <Tool
103 Name="VCCLCompilerTool" 105 Name="VCCLCompilerTool"
104 InlineFunctionExpansion="1" 106 InlineFunctionExpansion="1"
107 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
105 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;ASMV;ASMINF" 108 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;ASMV;ASMINF"
106 StringPooling="TRUE" 109 StringPooling="TRUE"
107 ExceptionHandling="FALSE" 110 ExceptionHandling="FALSE"
@@ -117,7 +120,7 @@
117 Name="VCCustomBuildTool"/> 120 Name="VCCustomBuildTool"/>
118 <Tool 121 <Tool
119 Name="VCLibrarianTool" 122 Name="VCLibrarianTool"
120 AdditionalOptions="gvmat32.obj inffas32.obj /NODEFAULTLIB " 123 AdditionalOptions="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj /NODEFAULTLIB "
121 OutputFile=".\zlibstat\zlibstat.lib" 124 OutputFile=".\zlibstat\zlibstat.lib"
122 SuppressStartupBanner="TRUE"/> 125 SuppressStartupBanner="TRUE"/>
123 <Tool 126 <Tool
@@ -144,6 +147,7 @@
144 <Tool 147 <Tool
145 Name="VCCLCompilerTool" 148 Name="VCCLCompilerTool"
146 InlineFunctionExpansion="1" 149 InlineFunctionExpansion="1"
150 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
147 PreprocessorDefinitions="WIN32;ZLIB_WINAPI" 151 PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
148 StringPooling="TRUE" 152 StringPooling="TRUE"
149 ExceptionHandling="FALSE" 153 ExceptionHandling="FALSE"
@@ -182,49 +186,49 @@
182 Name="Source Files" 186 Name="Source Files"
183 Filter=""> 187 Filter="">
184 <File 188 <File
185 RelativePath=".\adler32.c"> 189 RelativePath="..\..\..\adler32.c">
186 </File> 190 </File>
187 <File 191 <File
188 RelativePath=".\compress.c"> 192 RelativePath="..\..\..\compress.c">
189 </File> 193 </File>
190 <File 194 <File
191 RelativePath=".\crc32.c"> 195 RelativePath="..\..\..\crc32.c">
192 </File> 196 </File>
193 <File 197 <File
194 RelativePath=".\deflate.c"> 198 RelativePath="..\..\..\deflate.c">
195 </File> 199 </File>
196 <File 200 <File
197 RelativePath=".\gvmat32c.c"> 201 RelativePath="..\..\masmx86\gvmat32c.c">
198 </File> 202 </File>
199 <File 203 <File
200 RelativePath=".\gzio.c"> 204 RelativePath="..\..\..\gzio.c">
201 </File> 205 </File>
202 <File 206 <File
203 RelativePath=".\infback.c"> 207 RelativePath="..\..\..\infback.c">
204 </File> 208 </File>
205 <File 209 <File
206 RelativePath=".\inffast.c"> 210 RelativePath="..\..\..\inffast.c">
207 </File> 211 </File>
208 <File 212 <File
209 RelativePath=".\inflate.c"> 213 RelativePath="..\..\..\inflate.c">
210 </File> 214 </File>
211 <File 215 <File
212 RelativePath=".\inftrees.c"> 216 RelativePath="..\..\..\inftrees.c">
213 </File> 217 </File>
214 <File 218 <File
215 RelativePath=".\ioapi.c"> 219 RelativePath="..\..\minizip\ioapi.c">
216 </File> 220 </File>
217 <File 221 <File
218 RelativePath=".\trees.c"> 222 RelativePath="..\..\..\trees.c">
219 </File> 223 </File>
220 <File 224 <File
221 RelativePath=".\uncompr.c"> 225 RelativePath="..\..\..\uncompr.c">
222 </File> 226 </File>
223 <File 227 <File
224 RelativePath=".\unzip.c"> 228 RelativePath="..\..\minizip\unzip.c">
225 </File> 229 </File>
226 <File 230 <File
227 RelativePath=".\zip.c"> 231 RelativePath="..\..\minizip\zip.c">
228 </File> 232 </File>
229 <File 233 <File
230 RelativePath=".\zlib.rc"> 234 RelativePath=".\zlib.rc">
@@ -233,7 +237,7 @@
233 RelativePath=".\zlibvc.def"> 237 RelativePath=".\zlibvc.def">
234 </File> 238 </File>
235 <File 239 <File
236 RelativePath=".\zutil.c"> 240 RelativePath="..\..\..\zutil.c">
237 </File> 241 </File>
238 </Filter> 242 </Filter>
239 </Files> 243 </Files>
diff --git a/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc7/zlibvc.def
index 6bc26c4d..a40e7154 100644
--- a/contrib/vstudio/vc7/zlibvc.def
+++ b/contrib/vstudio/vc7/zlibvc.def
@@ -1,5 +1,5 @@
1 1
2VERSION 1.21 2VERSION 1.23
3 3
4HEAPSIZE 1048576,8192 4HEAPSIZE 1048576,8192
5 5
@@ -53,7 +53,7 @@ EXPORTS
53 deflateBound @47 53 deflateBound @47
54 gzclearerr @48 54 gzclearerr @48
55 gzungetc @49 55 gzungetc @49
56 zlibCompileFlags @50 56 zlibCompileFlags @50
57 deflatePrime @51 57 deflatePrime @51
58 58
59 unzOpen @61 59 unzOpen @61
diff --git a/contrib/vstudio/vc7/zlibvc.sln b/contrib/vstudio/vc7/zlibvc.sln
index 5a007ff6..927b42b7 100644
--- a/contrib/vstudio/vc7/zlibvc.sln
+++ b/contrib/vstudio/vc7/zlibvc.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj",
7EndProject 7EndProject
8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}" 8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
9EndProject 9EndProject
10Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testZlibDll", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"
11EndProject
10Global 12Global
11 GlobalSection(SolutionConfiguration) = preSolution 13 GlobalSection(SolutionConfiguration) = preSolution
12 ConfigName.0 = Debug 14 ConfigName.0 = Debug
@@ -58,6 +60,16 @@ Global
58 {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.Build.0 = Release|Win32 60 {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.Build.0 = Release|Win32
59 {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 61 {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32
60 {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 62 {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.Build.0 = Release|Win32
63 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.ActiveCfg = Debug|Win32
64 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.Build.0 = Debug|Win32
65 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.ActiveCfg = Release|Win32
66 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.Build.0 = Release|Win32
67 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.ActiveCfg = Release|Win32
68 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.Build.0 = Release|Win32
69 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.ActiveCfg = Release|Win32
70 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.Build.0 = Release|Win32
71 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32
72 {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.Build.0 = Release|Win32
61 EndGlobalSection 73 EndGlobalSection
62 GlobalSection(ExtensibilityGlobals) = postSolution 74 GlobalSection(ExtensibilityGlobals) = postSolution
63 EndGlobalSection 75 EndGlobalSection
diff --git a/contrib/vstudio/vc7/zlibvc.vcproj b/contrib/vstudio/vc7/zlibvc.vcproj
index 4e57bcdf..8533b494 100644
--- a/contrib/vstudio/vc7/zlibvc.vcproj
+++ b/contrib/vstudio/vc7/zlibvc.vcproj
@@ -20,6 +20,7 @@
20 <Tool 20 <Tool
21 Name="VCCLCompilerTool" 21 Name="VCCLCompilerTool"
22 Optimization="0" 22 Optimization="0"
23 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
23 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" 24 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"
24 ExceptionHandling="FALSE" 25 ExceptionHandling="FALSE"
25 RuntimeLibrary="1" 26 RuntimeLibrary="1"
@@ -35,7 +36,7 @@
35 <Tool 36 <Tool
36 Name="VCLinkerTool" 37 Name="VCLinkerTool"
37 AdditionalOptions="/MACHINE:I386" 38 AdditionalOptions="/MACHINE:I386"
38 AdditionalDependencies="gvmat32.obj inffas32.obj" 39 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
39 OutputFile=".\DebugDll\zlibwapi.dll" 40 OutputFile=".\DebugDll\zlibwapi.dll"
40 LinkIncremental="2" 41 LinkIncremental="2"
41 SuppressStartupBanner="TRUE" 42 SuppressStartupBanner="TRUE"
@@ -72,10 +73,12 @@
72 IntermediateDirectory=".\zlibDllWithoutAsm" 73 IntermediateDirectory=".\zlibDllWithoutAsm"
73 ConfigurationType="2" 74 ConfigurationType="2"
74 UseOfMFC="0" 75 UseOfMFC="0"
75 ATLMinimizesCRunTimeLibraryUsage="FALSE"> 76 ATLMinimizesCRunTimeLibraryUsage="FALSE"
77 WholeProgramOptimization="TRUE">
76 <Tool 78 <Tool
77 Name="VCCLCompilerTool" 79 Name="VCCLCompilerTool"
78 InlineFunctionExpansion="1" 80 InlineFunctionExpansion="1"
81 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
79 PreprocessorDefinitions="WIN32,ZLIB_WINAPI" 82 PreprocessorDefinitions="WIN32,ZLIB_WINAPI"
80 StringPooling="TRUE" 83 StringPooling="TRUE"
81 ExceptionHandling="FALSE" 84 ExceptionHandling="FALSE"
@@ -134,10 +137,12 @@
134 IntermediateDirectory=".\zlibDllWithoutCrtDll" 137 IntermediateDirectory=".\zlibDllWithoutCrtDll"
135 ConfigurationType="2" 138 ConfigurationType="2"
136 UseOfMFC="0" 139 UseOfMFC="0"
137 ATLMinimizesCRunTimeLibraryUsage="FALSE"> 140 ATLMinimizesCRunTimeLibraryUsage="FALSE"
141 WholeProgramOptimization="TRUE">
138 <Tool 142 <Tool
139 Name="VCCLCompilerTool" 143 Name="VCCLCompilerTool"
140 InlineFunctionExpansion="1" 144 InlineFunctionExpansion="1"
145 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
141 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" 146 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"
142 StringPooling="TRUE" 147 StringPooling="TRUE"
143 ExceptionHandling="FALSE" 148 ExceptionHandling="FALSE"
@@ -156,7 +161,7 @@
156 <Tool 161 <Tool
157 Name="VCLinkerTool" 162 Name="VCLinkerTool"
158 AdditionalOptions="/MACHINE:I386" 163 AdditionalOptions="/MACHINE:I386"
159 AdditionalDependencies="gvmat32.obj inffas32.obj " 164 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
160 OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll" 165 OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll"
161 LinkIncremental="1" 166 LinkIncremental="1"
162 SuppressStartupBanner="TRUE" 167 SuppressStartupBanner="TRUE"
@@ -196,10 +201,12 @@
196 IntermediateDirectory=".\zlibvc__" 201 IntermediateDirectory=".\zlibvc__"
197 ConfigurationType="2" 202 ConfigurationType="2"
198 UseOfMFC="0" 203 UseOfMFC="0"
199 ATLMinimizesCRunTimeLibraryUsage="FALSE"> 204 ATLMinimizesCRunTimeLibraryUsage="FALSE"
205 WholeProgramOptimization="TRUE">
200 <Tool 206 <Tool
201 Name="VCCLCompilerTool" 207 Name="VCCLCompilerTool"
202 InlineFunctionExpansion="1" 208 InlineFunctionExpansion="1"
209 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
203 PreprocessorDefinitions="WIN32,ZLIB_WINAPI" 210 PreprocessorDefinitions="WIN32,ZLIB_WINAPI"
204 StringPooling="TRUE" 211 StringPooling="TRUE"
205 ExceptionHandling="FALSE" 212 ExceptionHandling="FALSE"
@@ -256,10 +263,12 @@
256 IntermediateDirectory=".\ReleaseDll" 263 IntermediateDirectory=".\ReleaseDll"
257 ConfigurationType="2" 264 ConfigurationType="2"
258 UseOfMFC="0" 265 UseOfMFC="0"
259 ATLMinimizesCRunTimeLibraryUsage="FALSE"> 266 ATLMinimizesCRunTimeLibraryUsage="FALSE"
267 WholeProgramOptimization="TRUE">
260 <Tool 268 <Tool
261 Name="VCCLCompilerTool" 269 Name="VCCLCompilerTool"
262 InlineFunctionExpansion="1" 270 InlineFunctionExpansion="1"
271 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
263 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" 272 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"
264 StringPooling="TRUE" 273 StringPooling="TRUE"
265 ExceptionHandling="FALSE" 274 ExceptionHandling="FALSE"
@@ -278,7 +287,7 @@
278 <Tool 287 <Tool
279 Name="VCLinkerTool" 288 Name="VCLinkerTool"
280 AdditionalOptions="/MACHINE:I386" 289 AdditionalOptions="/MACHINE:I386"
281 AdditionalDependencies="gvmat32.obj inffas32.obj crtdll.lib" 290 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj crtdll.lib"
282 OutputFile=".\ReleaseDll\zlibwapi.dll" 291 OutputFile=".\ReleaseDll\zlibwapi.dll"
283 LinkIncremental="1" 292 LinkIncremental="1"
284 SuppressStartupBanner="TRUE" 293 SuppressStartupBanner="TRUE"
@@ -318,19 +327,19 @@
318 Name="Source Files" 327 Name="Source Files"
319 Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"> 328 Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
320 <File 329 <File
321 RelativePath=".\adler32.c"> 330 RelativePath="..\..\..\adler32.c">
322 </File> 331 </File>
323 <File 332 <File
324 RelativePath=".\compress.c"> 333 RelativePath="..\..\..\compress.c">
325 </File> 334 </File>
326 <File 335 <File
327 RelativePath=".\crc32.c"> 336 RelativePath="..\..\..\crc32.c">
328 </File> 337 </File>
329 <File 338 <File
330 RelativePath=".\deflate.c"> 339 RelativePath="..\..\..\deflate.c">
331 </File> 340 </File>
332 <File 341 <File
333 RelativePath=".\gvmat32c.c"> 342 RelativePath="..\..\masmx86\gvmat32c.c">
334 <FileConfiguration 343 <FileConfiguration
335 Name="ReleaseWithoutAsm|Win32" 344 Name="ReleaseWithoutAsm|Win32"
336 ExcludedFromBuild="TRUE"> 345 ExcludedFromBuild="TRUE">
@@ -339,34 +348,34 @@
339 </FileConfiguration> 348 </FileConfiguration>
340 </File> 349 </File>
341 <File 350 <File
342 RelativePath=".\gzio.c"> 351 RelativePath="..\..\..\gzio.c">
343 </File> 352 </File>
344 <File 353 <File
345 RelativePath=".\infback.c"> 354 RelativePath="..\..\..\infback.c">
346 </File> 355 </File>
347 <File 356 <File
348 RelativePath=".\inffast.c"> 357 RelativePath="..\..\..\inffast.c">
349 </File> 358 </File>
350 <File 359 <File
351 RelativePath=".\inflate.c"> 360 RelativePath="..\..\..\inflate.c">
352 </File> 361 </File>
353 <File 362 <File
354 RelativePath=".\inftrees.c"> 363 RelativePath="..\..\..\inftrees.c">
355 </File> 364 </File>
356 <File 365 <File
357 RelativePath=".\ioapi.c"> 366 RelativePath="..\..\minizip\ioapi.c">
358 </File> 367 </File>
359 <File 368 <File
360 RelativePath=".\iowin32.c"> 369 RelativePath="..\..\minizip\iowin32.c">
361 </File> 370 </File>
362 <File 371 <File
363 RelativePath=".\trees.c"> 372 RelativePath="..\..\..\trees.c">
364 </File> 373 </File>
365 <File 374 <File
366 RelativePath=".\uncompr.c"> 375 RelativePath="..\..\..\uncompr.c">
367 </File> 376 </File>
368 <File 377 <File
369 RelativePath=".\unzip.c"> 378 RelativePath="..\..\minizip\unzip.c">
370 <FileConfiguration 379 <FileConfiguration
371 Name="Release|Win32"> 380 Name="Release|Win32">
372 <Tool 381 <Tool
@@ -376,7 +385,7 @@
376 </FileConfiguration> 385 </FileConfiguration>
377 </File> 386 </File>
378 <File 387 <File
379 RelativePath=".\zip.c"> 388 RelativePath="..\..\minizip\zip.c">
380 <FileConfiguration 389 <FileConfiguration
381 Name="Release|Win32"> 390 Name="Release|Win32">
382 <Tool 391 <Tool
@@ -392,38 +401,38 @@
392 RelativePath=".\zlibvc.def"> 401 RelativePath=".\zlibvc.def">
393 </File> 402 </File>
394 <File 403 <File
395 RelativePath=".\zutil.c"> 404 RelativePath="..\..\..\zutil.c">
396 </File> 405 </File>
397 </Filter> 406 </Filter>
398 <Filter 407 <Filter
399 Name="Header Files" 408 Name="Header Files"
400 Filter="h;hpp;hxx;hm;inl;fi;fd"> 409 Filter="h;hpp;hxx;hm;inl;fi;fd">
401 <File 410 <File
402 RelativePath=".\deflate.h"> 411 RelativePath="..\..\..\deflate.h">
403 </File> 412 </File>
404 <File 413 <File
405 RelativePath=".\infblock.h"> 414 RelativePath="..\..\..\infblock.h">
406 </File> 415 </File>
407 <File 416 <File
408 RelativePath=".\infcodes.h"> 417 RelativePath="..\..\..\infcodes.h">
409 </File> 418 </File>
410 <File 419 <File
411 RelativePath=".\inffast.h"> 420 RelativePath="..\..\..\inffast.h">
412 </File> 421 </File>
413 <File 422 <File
414 RelativePath=".\inftrees.h"> 423 RelativePath="..\..\..\inftrees.h">
415 </File> 424 </File>
416 <File 425 <File
417 RelativePath=".\infutil.h"> 426 RelativePath="..\..\..\infutil.h">
418 </File> 427 </File>
419 <File 428 <File
420 RelativePath=".\zconf.h"> 429 RelativePath="..\..\..\zconf.h">
421 </File> 430 </File>
422 <File 431 <File
423 RelativePath=".\zlib.h"> 432 RelativePath="..\..\..\zlib.h">
424 </File> 433 </File>
425 <File 434 <File
426 RelativePath=".\zutil.h"> 435 RelativePath="..\..\..\zutil.h">
427 </File> 436 </File>
428 </Filter> 437 </Filter>
429 <Filter 438 <Filter
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-08-31 00:29:44 +0000