diff options
Diffstat (limited to '')
-rw-r--r-- | contrib/vstudio/vc7/zlibvc.vcproj (renamed from contrib/vstudio/vc70_32/zlibvc.vcproj) | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/contrib/vstudio/vc70_32/zlibvc.vcproj b/contrib/vstudio/vc7/zlibvc.vcproj index 7a9e83a..4e57bcd 100644 --- a/contrib/vstudio/vc70_32/zlibvc.vcproj +++ b/contrib/vstudio/vc7/zlibvc.vcproj | |||
@@ -20,7 +20,7 @@ | |||
20 | <Tool | 20 | <Tool |
21 | Name="VCCLCompilerTool" | 21 | Name="VCCLCompilerTool" |
22 | Optimization="0" | 22 | Optimization="0" |
23 | PreprocessorDefinitions="WIN32,ZLIB_DLL,ASMV" | 23 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" |
24 | ExceptionHandling="FALSE" | 24 | ExceptionHandling="FALSE" |
25 | RuntimeLibrary="1" | 25 | RuntimeLibrary="1" |
26 | PrecompiledHeaderFile=".\DebugDll/zlibvc.pch" | 26 | PrecompiledHeaderFile=".\DebugDll/zlibvc.pch" |
@@ -35,15 +35,15 @@ | |||
35 | <Tool | 35 | <Tool |
36 | Name="VCLinkerTool" | 36 | Name="VCLinkerTool" |
37 | AdditionalOptions="/MACHINE:I386" | 37 | AdditionalOptions="/MACHINE:I386" |
38 | AdditionalDependencies="gvmat32.obj " | 38 | AdditionalDependencies="gvmat32.obj inffas32.obj" |
39 | OutputFile=".\DebugDll\zlib.dll" | 39 | OutputFile=".\DebugDll\zlibwapi.dll" |
40 | LinkIncremental="2" | 40 | LinkIncremental="2" |
41 | SuppressStartupBanner="TRUE" | 41 | SuppressStartupBanner="TRUE" |
42 | ModuleDefinitionFile=".\zlibvc.def" | 42 | ModuleDefinitionFile=".\zlibvc.def" |
43 | GenerateDebugInformation="TRUE" | 43 | GenerateDebugInformation="TRUE" |
44 | ProgramDatabaseFile=".\DebugDll/zlib.pdb" | 44 | ProgramDatabaseFile=".\DebugDll/zlibwapi.pdb" |
45 | SubSystem="2" | 45 | SubSystem="2" |
46 | ImportLibrary=".\DebugDll/zlib.lib"/> | 46 | ImportLibrary=".\DebugDll/zlibwapi.lib"/> |
47 | <Tool | 47 | <Tool |
48 | Name="VCMIDLTool" | 48 | Name="VCMIDLTool" |
49 | PreprocessorDefinitions="_DEBUG" | 49 | PreprocessorDefinitions="_DEBUG" |
@@ -76,7 +76,7 @@ | |||
76 | <Tool | 76 | <Tool |
77 | Name="VCCLCompilerTool" | 77 | Name="VCCLCompilerTool" |
78 | InlineFunctionExpansion="1" | 78 | InlineFunctionExpansion="1" |
79 | PreprocessorDefinitions="WIN32,ZLIB_DLL" | 79 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI" |
80 | StringPooling="TRUE" | 80 | StringPooling="TRUE" |
81 | ExceptionHandling="FALSE" | 81 | ExceptionHandling="FALSE" |
82 | RuntimeLibrary="0" | 82 | RuntimeLibrary="0" |
@@ -95,17 +95,17 @@ | |||
95 | Name="VCLinkerTool" | 95 | Name="VCLinkerTool" |
96 | AdditionalOptions="/MACHINE:I386" | 96 | AdditionalOptions="/MACHINE:I386" |
97 | AdditionalDependencies="crtdll.lib" | 97 | AdditionalDependencies="crtdll.lib" |
98 | OutputFile=".\zlibDllWithoutAsm\zlib.dll" | 98 | OutputFile=".\zlibDllWithoutAsm\zlibwapi.dll" |
99 | LinkIncremental="1" | 99 | LinkIncremental="1" |
100 | SuppressStartupBanner="TRUE" | 100 | SuppressStartupBanner="TRUE" |
101 | IgnoreAllDefaultLibraries="TRUE" | 101 | IgnoreAllDefaultLibraries="TRUE" |
102 | ModuleDefinitionFile=".\zlibvc.def" | 102 | ModuleDefinitionFile=".\zlibvc.def" |
103 | ProgramDatabaseFile=".\zlibDllWithoutAsm/zlib.pdb" | 103 | ProgramDatabaseFile=".\zlibDllWithoutAsm/zlibwapi.pdb" |
104 | GenerateMapFile="TRUE" | 104 | GenerateMapFile="TRUE" |
105 | MapFileName=".\zlibDllWithoutAsm/zlib.map" | 105 | MapFileName=".\zlibDllWithoutAsm/zlibwapi.map" |
106 | SubSystem="2" | 106 | SubSystem="2" |
107 | OptimizeForWindows98="1" | 107 | OptimizeForWindows98="1" |
108 | ImportLibrary=".\zlibDllWithoutAsm/zlib.lib"/> | 108 | ImportLibrary=".\zlibDllWithoutAsm/zlibwapi.lib"/> |
109 | <Tool | 109 | <Tool |
110 | Name="VCMIDLTool" | 110 | Name="VCMIDLTool" |
111 | PreprocessorDefinitions="NDEBUG" | 111 | PreprocessorDefinitions="NDEBUG" |
@@ -138,7 +138,7 @@ | |||
138 | <Tool | 138 | <Tool |
139 | Name="VCCLCompilerTool" | 139 | Name="VCCLCompilerTool" |
140 | InlineFunctionExpansion="1" | 140 | InlineFunctionExpansion="1" |
141 | PreprocessorDefinitions="WIN32,ZLIB_DLL,ASMV" | 141 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" |
142 | StringPooling="TRUE" | 142 | StringPooling="TRUE" |
143 | ExceptionHandling="FALSE" | 143 | ExceptionHandling="FALSE" |
144 | RuntimeLibrary="0" | 144 | RuntimeLibrary="0" |
@@ -156,18 +156,18 @@ | |||
156 | <Tool | 156 | <Tool |
157 | Name="VCLinkerTool" | 157 | Name="VCLinkerTool" |
158 | AdditionalOptions="/MACHINE:I386" | 158 | AdditionalOptions="/MACHINE:I386" |
159 | AdditionalDependencies="gvmat32.obj inffastAsm.obj " | 159 | AdditionalDependencies="gvmat32.obj inffas32.obj " |
160 | OutputFile=".\zlibDllWithoutCrtDll\zlib.dll" | 160 | OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll" |
161 | LinkIncremental="1" | 161 | LinkIncremental="1" |
162 | SuppressStartupBanner="TRUE" | 162 | SuppressStartupBanner="TRUE" |
163 | IgnoreAllDefaultLibraries="FALSE" | 163 | IgnoreAllDefaultLibraries="FALSE" |
164 | ModuleDefinitionFile=".\zlibvc.def" | 164 | ModuleDefinitionFile=".\zlibvc.def" |
165 | ProgramDatabaseFile=".\zlibDllWithoutCrtDll/zlib.pdb" | 165 | ProgramDatabaseFile=".\zlibDllWithoutCrtDll/zlibwapi.pdb" |
166 | GenerateMapFile="TRUE" | 166 | GenerateMapFile="TRUE" |
167 | MapFileName=".\zlibDllWithoutCrtDll/zlib.map" | 167 | MapFileName=".\zlibDllWithoutCrtDll/zlibwapi.map" |
168 | SubSystem="2" | 168 | SubSystem="2" |
169 | OptimizeForWindows98="1" | 169 | OptimizeForWindows98="1" |
170 | ImportLibrary=".\zlibDllWithoutCrtDll/zlib.lib"/> | 170 | ImportLibrary=".\zlibDllWithoutCrtDll/zlibwapi.lib"/> |
171 | <Tool | 171 | <Tool |
172 | Name="VCMIDLTool" | 172 | Name="VCMIDLTool" |
173 | PreprocessorDefinitions="NDEBUG" | 173 | PreprocessorDefinitions="NDEBUG" |
@@ -200,7 +200,7 @@ | |||
200 | <Tool | 200 | <Tool |
201 | Name="VCCLCompilerTool" | 201 | Name="VCCLCompilerTool" |
202 | InlineFunctionExpansion="1" | 202 | InlineFunctionExpansion="1" |
203 | PreprocessorDefinitions="WIN32,ZLIB_DLL" | 203 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI" |
204 | StringPooling="TRUE" | 204 | StringPooling="TRUE" |
205 | ExceptionHandling="FALSE" | 205 | ExceptionHandling="FALSE" |
206 | RuntimeLibrary="0" | 206 | RuntimeLibrary="0" |
@@ -218,16 +218,16 @@ | |||
218 | <Tool | 218 | <Tool |
219 | Name="VCLinkerTool" | 219 | Name="VCLinkerTool" |
220 | AdditionalDependencies="crtdll.lib" | 220 | AdditionalDependencies="crtdll.lib" |
221 | OutputFile="zlibvc__\zlib.dll" | 221 | OutputFile="zlibvc__\zlibwapi.dll" |
222 | LinkIncremental="1" | 222 | LinkIncremental="1" |
223 | SuppressStartupBanner="TRUE" | 223 | SuppressStartupBanner="TRUE" |
224 | IgnoreAllDefaultLibraries="TRUE" | 224 | IgnoreAllDefaultLibraries="TRUE" |
225 | ModuleDefinitionFile=".\zlibvc.def" | 225 | ModuleDefinitionFile=".\zlibvc.def" |
226 | ProgramDatabaseFile=".\zlibvc__/zlib.pdb" | 226 | ProgramDatabaseFile=".\zlibvc__/zlibwapi.pdb" |
227 | GenerateMapFile="TRUE" | 227 | GenerateMapFile="TRUE" |
228 | MapFileName=".\zlibvc__/zlib.map" | 228 | MapFileName=".\zlibvc__/zlibwapi.map" |
229 | SubSystem="2" | 229 | SubSystem="2" |
230 | ImportLibrary=".\zlibvc__/zlib.lib"/> | 230 | ImportLibrary=".\zlibvc__/zlibwapi.lib"/> |
231 | <Tool | 231 | <Tool |
232 | Name="VCMIDLTool" | 232 | Name="VCMIDLTool" |
233 | PreprocessorDefinitions="NDEBUG" | 233 | PreprocessorDefinitions="NDEBUG" |
@@ -260,7 +260,7 @@ | |||
260 | <Tool | 260 | <Tool |
261 | Name="VCCLCompilerTool" | 261 | Name="VCCLCompilerTool" |
262 | InlineFunctionExpansion="1" | 262 | InlineFunctionExpansion="1" |
263 | PreprocessorDefinitions="WIN32,ZLIB_DLL,ASMV" | 263 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" |
264 | StringPooling="TRUE" | 264 | StringPooling="TRUE" |
265 | ExceptionHandling="FALSE" | 265 | ExceptionHandling="FALSE" |
266 | RuntimeLibrary="0" | 266 | RuntimeLibrary="0" |
@@ -278,18 +278,18 @@ | |||
278 | <Tool | 278 | <Tool |
279 | Name="VCLinkerTool" | 279 | Name="VCLinkerTool" |
280 | AdditionalOptions="/MACHINE:I386" | 280 | AdditionalOptions="/MACHINE:I386" |
281 | AdditionalDependencies="gvmat32.obj inffastAsm.obj crtdll.lib" | 281 | AdditionalDependencies="gvmat32.obj inffas32.obj crtdll.lib" |
282 | OutputFile=".\ReleaseDll\zlib.dll" | 282 | OutputFile=".\ReleaseDll\zlibwapi.dll" |
283 | LinkIncremental="1" | 283 | LinkIncremental="1" |
284 | SuppressStartupBanner="TRUE" | 284 | SuppressStartupBanner="TRUE" |
285 | IgnoreAllDefaultLibraries="TRUE" | 285 | IgnoreAllDefaultLibraries="TRUE" |
286 | ModuleDefinitionFile=".\zlibvc.def" | 286 | ModuleDefinitionFile=".\zlibvc.def" |
287 | ProgramDatabaseFile=".\ReleaseDll/zlib.pdb" | 287 | ProgramDatabaseFile=".\ReleaseDll/zlibwapi.pdb" |
288 | GenerateMapFile="TRUE" | 288 | GenerateMapFile="TRUE" |
289 | MapFileName=".\ReleaseDll/zlib.map" | 289 | MapFileName=".\ReleaseDll/zlibwapi.map" |
290 | SubSystem="2" | 290 | SubSystem="2" |
291 | OptimizeForWindows98="1" | 291 | OptimizeForWindows98="1" |
292 | ImportLibrary=".\ReleaseDll/zlib.lib"/> | 292 | ImportLibrary=".\ReleaseDll/zlibwapi.lib"/> |
293 | <Tool | 293 | <Tool |
294 | Name="VCMIDLTool" | 294 | Name="VCMIDLTool" |
295 | PreprocessorDefinitions="NDEBUG" | 295 | PreprocessorDefinitions="NDEBUG" |
@@ -346,18 +346,6 @@ | |||
346 | </File> | 346 | </File> |
347 | <File | 347 | <File |
348 | RelativePath=".\inffast.c"> | 348 | RelativePath=".\inffast.c"> |
349 | <FileConfiguration | ||
350 | Name="ReleaseWithoutCrtdll|Win32" | ||
351 | ExcludedFromBuild="TRUE"> | ||
352 | <Tool | ||
353 | Name="VCCLCompilerTool"/> | ||
354 | </FileConfiguration> | ||
355 | <FileConfiguration | ||
356 | Name="Release|Win32" | ||
357 | ExcludedFromBuild="TRUE"> | ||
358 | <Tool | ||
359 | Name="VCCLCompilerTool"/> | ||
360 | </FileConfiguration> | ||
361 | </File> | 349 | </File> |
362 | <File | 350 | <File |
363 | RelativePath=".\inflate.c"> | 351 | RelativePath=".\inflate.c"> |