summaryrefslogtreecommitdiff
path: root/contrib/testzlib
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--contrib/testzlib/rdtsc64.asm18
-rw-r--r--contrib/testzlib/rdtsc64.objbin744 -> 0 bytes
-rw-r--r--contrib/testzlib/testzlib.c33
-rw-r--r--contrib/testzlib/testzlib.sln21
-rw-r--r--contrib/testzlib/testzlib8.sln32
-rw-r--r--contrib/vstudio/vc7/testzlib.vcproj (renamed from contrib/testzlib/testzlib.vcproj)10
-rw-r--r--contrib/vstudio/vc8/testzlibdll.vcproj (renamed from contrib/testzlib/testzlib8.vcproj)347
7 files changed, 169 insertions, 292 deletions
diff --git a/contrib/testzlib/rdtsc64.asm b/contrib/testzlib/rdtsc64.asm
deleted file mode 100644
index 6b78a8b..0000000
--- a/contrib/testzlib/rdtsc64.asm
+++ /dev/null
@@ -1,18 +0,0 @@
1; rdtsc64.asm
2;
3; unsigned _int64 myrdtsc();
4;
5; return the performance rdtsc value, on AMD64/Intel EM64T
6;
7; compile with :
8; ml64.exe" /Flrdtsc64 /c /Zi rdtsc64.asm
9;
10.code
11myrdtsc PROC
12 rdtsc
13 shl rdx,32
14 or rax,rdx
15 ret
16myrdtsc ENDP
17
18END
diff --git a/contrib/testzlib/rdtsc64.obj b/contrib/testzlib/rdtsc64.obj
deleted file mode 100644
index 7905142..0000000
--- a/contrib/testzlib/rdtsc64.obj
+++ /dev/null
Binary files differ
diff --git a/contrib/testzlib/testzlib.c b/contrib/testzlib/testzlib.c
index 6c3ff9f..e5574f4 100644
--- a/contrib/testzlib/testzlib.c
+++ b/contrib/testzlib/testzlib.c
@@ -1,7 +1,7 @@
1
2#include <stdio.h> 1#include <stdio.h>
3#include <stdlib.h> 2#include <stdlib.h>
4#include <windows.h> 3#include <windows.h>
4
5#include "zlib.h" 5#include "zlib.h"
6 6
7 7
@@ -17,23 +17,25 @@ void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)
17 } 17 }
18} 18}
19 19
20#ifdef _AMD64_ 20#ifdef _M_X64
21unsigned _int64 myrdtsc(); 21// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc
22unsigned __int64 __rdtsc(void);
22void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64) 23void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
23{ 24{
24 // printf("rdtsc = %I64x\n",myrdtsc()); 25 // printf("rdtsc = %I64x\n",__rdtsc());
25 pbeginTime64->QuadPart=myrdtsc(); 26 pbeginTime64->QuadPart=__rdtsc();
26} 27}
27 28
28LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) 29LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
29{ 30{
30 LARGE_INTEGER LIres; 31 LARGE_INTEGER LIres;
31 unsigned _int64 res=myrdtsc()-((unsigned _int64)(beginTime64.QuadPart)); 32 unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart));
32 LIres.QuadPart=res; 33 LIres.QuadPart=res;
33 // printf("rdtsc = %I64x\n",myrdtsc()); 34 // printf("rdtsc = %I64x\n",__rdtsc());
34 return LIres; 35 return LIres;
35} 36}
36#else 37#else
38#ifdef _M_IX86
37void myGetRDTSC32(LARGE_INTEGER * pbeginTime64) 39void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
38{ 40{
39 DWORD dwEdx,dwEax; 41 DWORD dwEdx,dwEax;
@@ -61,8 +63,23 @@ LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
61 MyDoMinus64(&LIres,endTime64,beginTime64); 63 MyDoMinus64(&LIres,endTime64,beginTime64);
62 return LIres; 64 return LIres;
63} 65}
64#endif 66#else
67void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
68{
69}
70
71void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
72{
73}
65 74
75LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
76{
77 LARGE_INTEGER lr;
78 lr.QuadPart=0;
79 return lr;
80}
81#endif
82#endif
66 83
67void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf) 84void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf)
68{ 85{
diff --git a/contrib/testzlib/testzlib.sln b/contrib/testzlib/testzlib.sln
deleted file mode 100644
index 86da716..0000000
--- a/contrib/testzlib/testzlib.sln
+++ /dev/null
@@ -1,21 +0,0 @@
1Microsoft Visual Studio Solution File, Format Version 7.00
2Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
3EndProject
4Global
5 GlobalSection(SolutionConfiguration) = preSolution
6 ConfigName.0 = Debug
7 ConfigName.1 = Release
8 EndGlobalSection
9 GlobalSection(ProjectDependencies) = postSolution
10 EndGlobalSection
11 GlobalSection(ProjectConfiguration) = postSolution
12 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32
13 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32
14 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32
15 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32
16 EndGlobalSection
17 GlobalSection(ExtensibilityGlobals) = postSolution
18 EndGlobalSection
19 GlobalSection(ExtensibilityAddIns) = postSolution
20 EndGlobalSection
21EndGlobal
diff --git a/contrib/testzlib/testzlib8.sln b/contrib/testzlib/testzlib8.sln
deleted file mode 100644
index 794f72d..0000000
--- a/contrib/testzlib/testzlib8.sln
+++ /dev/null
@@ -1,32 +0,0 @@
1
2Microsoft Visual Studio Solution File, Format Version 9.00
3# Visual Studio 2005
4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib8", "testzlib8.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
5EndProject
6Global
7 GlobalSection(SolutionConfigurationPlatforms) = preSolution
8 Debug|Win32 = Debug|Win32
9 Debug|Win64 (AMD64) = Debug|Win64 (AMD64)
10 Release|Win32 = Release|Win32
11 Release|Win64 (AMD64) = Release|Win64 (AMD64)
12 ReleaseAsm|Win32 = ReleaseAsm|Win32
13 ReleaseAsm|Win64 (AMD64) = ReleaseAsm|Win64 (AMD64)
14 EndGlobalSection
15 GlobalSection(ProjectConfigurationPlatforms) = postSolution
16 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
17 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
18 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win64 (AMD64).ActiveCfg = Debug|Win64 (AMD64)
19 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win64 (AMD64).Build.0 = Debug|Win64 (AMD64)
20 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
21 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
22 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win64 (AMD64).ActiveCfg = Release|Win64 (AMD64)
23 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win64 (AMD64).Build.0 = Release|Win64 (AMD64)
24 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win32.ActiveCfg = ReleaseAsm|Win32
25 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win32.Build.0 = ReleaseAsm|Win32
26 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win64 (AMD64).ActiveCfg = ReleaseAsm|Win64 (AMD64)
27 {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win64 (AMD64).Build.0 = ReleaseAsm|Win64 (AMD64)
28 EndGlobalSection
29 GlobalSection(SolutionProperties) = preSolution
30 HideSolutionNode = FALSE
31 EndGlobalSection
32EndGlobal
diff --git a/contrib/testzlib/testzlib.vcproj b/contrib/vstudio/vc7/testzlib.vcproj
index bd9b39b..97bc3e8 100644
--- a/contrib/testzlib/testzlib.vcproj
+++ b/contrib/vstudio/vc7/testzlib.vcproj
@@ -2,8 +2,8 @@
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="7.00" 4 Version="7.00"
5 Name="testzlib" 5 Name="testZlibDll"
6 ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" 6 ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"
7 Keyword="Win32Proj"> 7 Keyword="Win32Proj">
8 <Platforms> 8 <Platforms>
9 <Platform 9 <Platform
@@ -19,6 +19,7 @@
19 <Tool 19 <Tool
20 Name="VCCLCompilerTool" 20 Name="VCCLCompilerTool"
21 Optimization="0" 21 Optimization="0"
22 AdditionalIncludeDirectories="..\..\.."
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="..\..\.."
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="testzlib.c"> 109 RelativePath="..\..\testzlib\testzlib.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/testzlib/testzlib8.vcproj b/contrib/vstudio/vc8/testzlibdll.vcproj
index 3cab776..f38ab5e 100644
--- a/contrib/testzlib/testzlib8.vcproj
+++ b/contrib/vstudio/vc8/testzlibdll.vcproj
@@ -2,29 +2,31 @@
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="8,00" 4 Version="8,00"
5 Name="testzlib8" 5 Name="TestZlibDll"
6 ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" 6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 SignManifests="true"
8 > 9 >
9 <Platforms> 10 <Platforms>
10 <Platform 11 <Platform
11 Name="Win32" 12 Name="Win32"
12 /> 13 />
13 <Platform 14 <Platform
14 Name="Win64 (AMD64)" 15 Name="x64"
16 />
17 <Platform
18 Name="Itanium"
15 /> 19 />
16 </Platforms> 20 </Platforms>
17 <ToolFiles> 21 <ToolFiles>
18 <DefaultToolFile
19 FileName="masm.tool"
20 />
21 </ToolFiles> 22 </ToolFiles>
22 <Configurations> 23 <Configurations>
23 <Configuration 24 <Configuration
24 Name="Debug|Win32" 25 Name="Debug|Win32"
25 OutputDirectory="x86\$(ConfigurationName)" 26 OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
26 IntermediateDirectory="x86\$(ConfigurationName)" 27 IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
27 ConfigurationType="1" 28 ConfigurationType="1"
29 InheritedPropertySheets="UpgradeFromVC70.vsprops"
28 CharacterSet="2" 30 CharacterSet="2"
29 > 31 >
30 <Tool 32 <Tool
@@ -34,9 +36,6 @@
34 Name="VCCustomBuildTool" 36 Name="VCCustomBuildTool"
35 /> 37 />
36 <Tool 38 <Tool
37 Name="MASM"
38 />
39 <Tool
40 Name="VCXMLDataGeneratorTool" 39 Name="VCXMLDataGeneratorTool"
41 /> 40 />
42 <Tool 41 <Tool
@@ -48,14 +47,16 @@
48 <Tool 47 <Tool
49 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
50 Optimization="0" 49 Optimization="0"
51 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 50 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
52 MinimalRebuild="TRUE" 51 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
53 BasicRuntimeChecks="3" 52 MinimalRebuild="true"
53 BasicRuntimeChecks="0"
54 RuntimeLibrary="1" 54 RuntimeLibrary="1"
55 BufferSecurityCheck="false"
55 UsePrecompiledHeader="0" 56 UsePrecompiledHeader="0"
56 AssemblerOutput="4" 57 AssemblerListingLocation="$(IntDir)\"
57 WarningLevel="3" 58 WarningLevel="3"
58 Detect64BitPortabilityProblems="TRUE" 59 Detect64BitPortabilityProblems="true"
59 DebugInformationFormat="4" 60 DebugInformationFormat="4"
60 /> 61 />
61 <Tool 62 <Tool
@@ -69,10 +70,11 @@
69 /> 70 />
70 <Tool 71 <Tool
71 Name="VCLinkerTool" 72 Name="VCLinkerTool"
72 AdditionalDependencies="gvmat32.obj inffas32.obj" 73 AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
73 OutputFile="$(OutDir)/testzlib.exe" 74 OutputFile="$(OutDir)/testzlib.exe"
74 LinkIncremental="2" 75 LinkIncremental="2"
75 GenerateDebugInformation="TRUE" 76 GenerateManifest="false"
77 GenerateDebugInformation="true"
76 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 78 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
77 SubSystem="1" 79 SubSystem="1"
78 TargetMachine="1" 80 TargetMachine="1"
@@ -90,6 +92,9 @@
90 Name="VCBscMakeTool" 92 Name="VCBscMakeTool"
91 /> 93 />
92 <Tool 94 <Tool
95 Name="VCFxCopTool"
96 />
97 <Tool
93 Name="VCAppVerifierTool" 98 Name="VCAppVerifierTool"
94 /> 99 />
95 <Tool 100 <Tool
@@ -100,10 +105,11 @@
100 /> 105 />
101 </Configuration> 106 </Configuration>
102 <Configuration 107 <Configuration
103 Name="Debug|Win64 (AMD64)" 108 Name="Debug|x64"
104 OutputDirectory="amd64\$(ConfigurationName)" 109 OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
105 IntermediateDirectory="amd64\$(ConfigurationName)" 110 IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
106 ConfigurationType="1" 111 ConfigurationType="1"
112 InheritedPropertySheets="UpgradeFromVC70.vsprops"
107 CharacterSet="2" 113 CharacterSet="2"
108 > 114 >
109 <Tool 115 <Tool
@@ -113,9 +119,6 @@
113 Name="VCCustomBuildTool" 119 Name="VCCustomBuildTool"
114 /> 120 />
115 <Tool 121 <Tool
116 Name="MASM"
117 />
118 <Tool
119 Name="VCXMLDataGeneratorTool" 122 Name="VCXMLDataGeneratorTool"
120 /> 123 />
121 <Tool 124 <Tool
@@ -128,14 +131,16 @@
128 <Tool 131 <Tool
129 Name="VCCLCompilerTool" 132 Name="VCCLCompilerTool"
130 Optimization="0" 133 Optimization="0"
131 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
132 MinimalRebuild="TRUE" 135 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
133 BasicRuntimeChecks="3" 136 MinimalRebuild="true"
134 RuntimeLibrary="1" 137 BasicRuntimeChecks="0"
138 RuntimeLibrary="3"
139 BufferSecurityCheck="false"
135 UsePrecompiledHeader="0" 140 UsePrecompiledHeader="0"
136 AssemblerOutput="4" 141 AssemblerListingLocation="$(IntDir)\"
137 WarningLevel="3" 142 WarningLevel="3"
138 Detect64BitPortabilityProblems="TRUE" 143 Detect64BitPortabilityProblems="true"
139 DebugInformationFormat="3" 144 DebugInformationFormat="3"
140 /> 145 />
141 <Tool 146 <Tool
@@ -146,14 +151,14 @@
146 /> 151 />
147 <Tool 152 <Tool
148 Name="VCPreLinkEventTool" 153 Name="VCPreLinkEventTool"
149 CommandLine=""
150 /> 154 />
151 <Tool 155 <Tool
152 Name="VCLinkerTool" 156 Name="VCLinkerTool"
153 AdditionalDependencies="gvmat64.obj inffasx64.obj rdtsc64.obj" 157 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
154 OutputFile="$(OutDir)/testzlib.exe" 158 OutputFile="$(OutDir)/testzlib.exe"
155 LinkIncremental="2" 159 LinkIncremental="2"
156 GenerateDebugInformation="TRUE" 160 GenerateManifest="false"
161 GenerateDebugInformation="true"
157 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 162 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
158 SubSystem="1" 163 SubSystem="1"
159 TargetMachine="17" 164 TargetMachine="17"
@@ -171,6 +176,12 @@
171 Name="VCBscMakeTool" 176 Name="VCBscMakeTool"
172 /> 177 />
173 <Tool 178 <Tool
179 Name="VCFxCopTool"
180 />
181 <Tool
182 Name="VCAppVerifierTool"
183 />
184 <Tool
174 Name="VCWebDeploymentTool" 185 Name="VCWebDeploymentTool"
175 /> 186 />
176 <Tool 187 <Tool
@@ -178,10 +189,11 @@
178 /> 189 />
179 </Configuration> 190 </Configuration>
180 <Configuration 191 <Configuration
181 Name="Release|Win32" 192 Name="Debug|Itanium"
182 OutputDirectory="x86\$(ConfigurationName)" 193 OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
183 IntermediateDirectory="x86\$(ConfigurationName)" 194 IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
184 ConfigurationType="1" 195 ConfigurationType="1"
196 InheritedPropertySheets="UpgradeFromVC70.vsprops"
185 CharacterSet="2" 197 CharacterSet="2"
186 > 198 >
187 <Tool 199 <Tool
@@ -191,9 +203,6 @@
191 Name="VCCustomBuildTool" 203 Name="VCCustomBuildTool"
192 /> 204 />
193 <Tool 205 <Tool
194 Name="MASM"
195 />
196 <Tool
197 Name="VCXMLDataGeneratorTool" 206 Name="VCXMLDataGeneratorTool"
198 /> 207 />
199 <Tool 208 <Tool
@@ -201,19 +210,21 @@
201 /> 210 />
202 <Tool 211 <Tool
203 Name="VCMIDLTool" 212 Name="VCMIDLTool"
213 TargetEnvironment="2"
204 /> 214 />
205 <Tool 215 <Tool
206 Name="VCCLCompilerTool" 216 Name="VCCLCompilerTool"
207 Optimization="2" 217 Optimization="0"
208 InlineFunctionExpansion="1" 218 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
209 OmitFramePointers="TRUE" 219 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
210 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 220 MinimalRebuild="true"
211 StringPooling="TRUE" 221 BasicRuntimeChecks="0"
212 RuntimeLibrary="0" 222 RuntimeLibrary="3"
213 EnableFunctionLevelLinking="TRUE" 223 BufferSecurityCheck="false"
214 UsePrecompiledHeader="0" 224 UsePrecompiledHeader="0"
225 AssemblerListingLocation="$(IntDir)\"
215 WarningLevel="3" 226 WarningLevel="3"
216 Detect64BitPortabilityProblems="TRUE" 227 Detect64BitPortabilityProblems="true"
217 DebugInformationFormat="3" 228 DebugInformationFormat="3"
218 /> 229 />
219 <Tool 230 <Tool
@@ -227,14 +238,14 @@
227 /> 238 />
228 <Tool 239 <Tool
229 Name="VCLinkerTool" 240 Name="VCLinkerTool"
241 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
230 OutputFile="$(OutDir)/testzlib.exe" 242 OutputFile="$(OutDir)/testzlib.exe"
231 LinkIncremental="1" 243 LinkIncremental="2"
232 GenerateDebugInformation="TRUE" 244 GenerateManifest="false"
245 GenerateDebugInformation="true"
246 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
233 SubSystem="1" 247 SubSystem="1"
234 OptimizeReferences="2" 248 TargetMachine="5"
235 EnableCOMDATFolding="2"
236 OptimizeForWindows98="1"
237 TargetMachine="1"
238 /> 249 />
239 <Tool 250 <Tool
240 Name="VCALinkTool" 251 Name="VCALinkTool"
@@ -249,6 +260,9 @@
249 Name="VCBscMakeTool" 260 Name="VCBscMakeTool"
250 /> 261 />
251 <Tool 262 <Tool
263 Name="VCFxCopTool"
264 />
265 <Tool
252 Name="VCAppVerifierTool" 266 Name="VCAppVerifierTool"
253 /> 267 />
254 <Tool 268 <Tool
@@ -259,10 +273,11 @@
259 /> 273 />
260 </Configuration> 274 </Configuration>
261 <Configuration 275 <Configuration
262 Name="Release|Win64 (AMD64)" 276 Name="Release|Win32"
263 OutputDirectory="amd64\$(ConfigurationName)" 277 OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
264 IntermediateDirectory="amd64\$(ConfigurationName)" 278 IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
265 ConfigurationType="1" 279 ConfigurationType="1"
280 InheritedPropertySheets="UpgradeFromVC70.vsprops"
266 CharacterSet="2" 281 CharacterSet="2"
267 > 282 >
268 <Tool 283 <Tool
@@ -272,9 +287,6 @@
272 Name="VCCustomBuildTool" 287 Name="VCCustomBuildTool"
273 /> 288 />
274 <Tool 289 <Tool
275 Name="MASM"
276 />
277 <Tool
278 Name="VCXMLDataGeneratorTool" 290 Name="VCXMLDataGeneratorTool"
279 /> 291 />
280 <Tool 292 <Tool
@@ -282,20 +294,23 @@
282 /> 294 />
283 <Tool 295 <Tool
284 Name="VCMIDLTool" 296 Name="VCMIDLTool"
285 TargetEnvironment="3"
286 /> 297 />
287 <Tool 298 <Tool
288 Name="VCCLCompilerTool" 299 Name="VCCLCompilerTool"
289 Optimization="2" 300 Optimization="2"
290 InlineFunctionExpansion="1" 301 InlineFunctionExpansion="1"
291 OmitFramePointers="TRUE" 302 OmitFramePointers="true"
292 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 303 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
293 StringPooling="TRUE" 304 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
305 StringPooling="true"
306 BasicRuntimeChecks="0"
294 RuntimeLibrary="0" 307 RuntimeLibrary="0"
295 EnableFunctionLevelLinking="TRUE" 308 BufferSecurityCheck="false"
309 EnableFunctionLevelLinking="true"
296 UsePrecompiledHeader="0" 310 UsePrecompiledHeader="0"
311 AssemblerListingLocation="$(IntDir)\"
297 WarningLevel="3" 312 WarningLevel="3"
298 Detect64BitPortabilityProblems="TRUE" 313 Detect64BitPortabilityProblems="true"
299 DebugInformationFormat="3" 314 DebugInformationFormat="3"
300 /> 315 />
301 <Tool 316 <Tool
@@ -309,15 +324,16 @@
309 /> 324 />
310 <Tool 325 <Tool
311 Name="VCLinkerTool" 326 Name="VCLinkerTool"
312 AdditionalDependencies="rdtsc64.obj" 327 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
313 OutputFile="$(OutDir)/testzlib.exe" 328 OutputFile="$(OutDir)/testzlib.exe"
314 LinkIncremental="1" 329 LinkIncremental="1"
315 GenerateDebugInformation="TRUE" 330 GenerateManifest="false"
331 GenerateDebugInformation="true"
316 SubSystem="1" 332 SubSystem="1"
317 OptimizeReferences="2" 333 OptimizeReferences="2"
318 EnableCOMDATFolding="2" 334 EnableCOMDATFolding="2"
319 OptimizeForWindows98="1" 335 OptimizeForWindows98="1"
320 TargetMachine="17" 336 TargetMachine="1"
321 /> 337 />
322 <Tool 338 <Tool
323 Name="VCALinkTool" 339 Name="VCALinkTool"
@@ -332,6 +348,12 @@
332 Name="VCBscMakeTool" 348 Name="VCBscMakeTool"
333 /> 349 />
334 <Tool 350 <Tool
351 Name="VCFxCopTool"
352 />
353 <Tool
354 Name="VCAppVerifierTool"
355 />
356 <Tool
335 Name="VCWebDeploymentTool" 357 Name="VCWebDeploymentTool"
336 /> 358 />
337 <Tool 359 <Tool
@@ -339,10 +361,11 @@
339 /> 361 />
340 </Configuration> 362 </Configuration>
341 <Configuration 363 <Configuration
342 Name="ReleaseAsm|Win32" 364 Name="Release|x64"
343 OutputDirectory="x86\$(ConfigurationName)" 365 OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
344 IntermediateDirectory="x86\$(ConfigurationName)" 366 IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
345 ConfigurationType="1" 367 ConfigurationType="1"
368 InheritedPropertySheets="UpgradeFromVC70.vsprops"
346 CharacterSet="2" 369 CharacterSet="2"
347 > 370 >
348 <Tool 371 <Tool
@@ -352,9 +375,6 @@
352 Name="VCCustomBuildTool" 375 Name="VCCustomBuildTool"
353 /> 376 />
354 <Tool 377 <Tool
355 Name="MASM"
356 />
357 <Tool
358 Name="VCXMLDataGeneratorTool" 378 Name="VCXMLDataGeneratorTool"
359 /> 379 />
360 <Tool 380 <Tool
@@ -362,19 +382,24 @@
362 /> 382 />
363 <Tool 383 <Tool
364 Name="VCMIDLTool" 384 Name="VCMIDLTool"
385 TargetEnvironment="3"
365 /> 386 />
366 <Tool 387 <Tool
367 Name="VCCLCompilerTool" 388 Name="VCCLCompilerTool"
368 Optimization="2" 389 Optimization="2"
369 InlineFunctionExpansion="1" 390 InlineFunctionExpansion="1"
370 OmitFramePointers="TRUE" 391 OmitFramePointers="true"
371 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 392 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
372 StringPooling="TRUE" 393 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
373 RuntimeLibrary="0" 394 StringPooling="true"
374 EnableFunctionLevelLinking="TRUE" 395 BasicRuntimeChecks="0"
396 RuntimeLibrary="2"
397 BufferSecurityCheck="false"
398 EnableFunctionLevelLinking="true"
375 UsePrecompiledHeader="0" 399 UsePrecompiledHeader="0"
400 AssemblerListingLocation="$(IntDir)\"
376 WarningLevel="3" 401 WarningLevel="3"
377 Detect64BitPortabilityProblems="TRUE" 402 Detect64BitPortabilityProblems="true"
378 DebugInformationFormat="3" 403 DebugInformationFormat="3"
379 /> 404 />
380 <Tool 405 <Tool
@@ -388,15 +413,16 @@
388 /> 413 />
389 <Tool 414 <Tool
390 Name="VCLinkerTool" 415 Name="VCLinkerTool"
391 AdditionalDependencies="gvmat32.obj inffas32.obj" 416 AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
392 OutputFile="$(OutDir)/testzlib.exe" 417 OutputFile="$(OutDir)/testzlib.exe"
393 LinkIncremental="1" 418 LinkIncremental="1"
394 GenerateDebugInformation="TRUE" 419 GenerateManifest="false"
420 GenerateDebugInformation="true"
395 SubSystem="1" 421 SubSystem="1"
396 OptimizeReferences="2" 422 OptimizeReferences="2"
397 EnableCOMDATFolding="2" 423 EnableCOMDATFolding="2"
398 OptimizeForWindows98="1" 424 OptimizeForWindows98="1"
399 TargetMachine="1" 425 TargetMachine="17"
400 /> 426 />
401 <Tool 427 <Tool
402 Name="VCALinkTool" 428 Name="VCALinkTool"
@@ -411,6 +437,9 @@
411 Name="VCBscMakeTool" 437 Name="VCBscMakeTool"
412 /> 438 />
413 <Tool 439 <Tool
440 Name="VCFxCopTool"
441 />
442 <Tool
414 Name="VCAppVerifierTool" 443 Name="VCAppVerifierTool"
415 /> 444 />
416 <Tool 445 <Tool
@@ -421,23 +450,20 @@
421 /> 450 />
422 </Configuration> 451 </Configuration>
423 <Configuration 452 <Configuration
424 Name="ReleaseAsm|Win64 (AMD64)" 453 Name="Release|Itanium"
425 OutputDirectory="amd64\$(ConfigurationName)" 454 OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
426 IntermediateDirectory="amd64\$(ConfigurationName)" 455 IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
427 ConfigurationType="1" 456 ConfigurationType="1"
457 InheritedPropertySheets="UpgradeFromVC70.vsprops"
428 CharacterSet="2" 458 CharacterSet="2"
429 > 459 >
430 <Tool 460 <Tool
431 Name="VCPreBuildEventTool" 461 Name="VCPreBuildEventTool"
432 CommandLine=""
433 /> 462 />
434 <Tool 463 <Tool
435 Name="VCCustomBuildTool" 464 Name="VCCustomBuildTool"
436 /> 465 />
437 <Tool 466 <Tool
438 Name="MASM"
439 />
440 <Tool
441 Name="VCXMLDataGeneratorTool" 467 Name="VCXMLDataGeneratorTool"
442 /> 468 />
443 <Tool 469 <Tool
@@ -445,21 +471,24 @@
445 /> 471 />
446 <Tool 472 <Tool
447 Name="VCMIDLTool" 473 Name="VCMIDLTool"
448 TargetEnvironment="3" 474 TargetEnvironment="2"
449 /> 475 />
450 <Tool 476 <Tool
451 Name="VCCLCompilerTool" 477 Name="VCCLCompilerTool"
452 Optimization="2" 478 Optimization="2"
453 InlineFunctionExpansion="1" 479 InlineFunctionExpansion="1"
454 OmitFramePointers="TRUE" 480 OmitFramePointers="true"
455 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 481 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
456 StringPooling="TRUE" 482 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
457 RuntimeLibrary="0" 483 StringPooling="true"
458 EnableFunctionLevelLinking="TRUE" 484 BasicRuntimeChecks="0"
485 RuntimeLibrary="2"
486 BufferSecurityCheck="false"
487 EnableFunctionLevelLinking="true"
459 UsePrecompiledHeader="0" 488 UsePrecompiledHeader="0"
460 AssemblerOutput="4" 489 AssemblerListingLocation="$(IntDir)\"
461 WarningLevel="3" 490 WarningLevel="3"
462 Detect64BitPortabilityProblems="TRUE" 491 Detect64BitPortabilityProblems="true"
463 DebugInformationFormat="3" 492 DebugInformationFormat="3"
464 /> 493 />
465 <Tool 494 <Tool
@@ -470,19 +499,19 @@
470 /> 499 />
471 <Tool 500 <Tool
472 Name="VCPreLinkEventTool" 501 Name="VCPreLinkEventTool"
473 CommandLine=""
474 /> 502 />
475 <Tool 503 <Tool
476 Name="VCLinkerTool" 504 Name="VCLinkerTool"
477 AdditionalDependencies="gvmat64.obj inffasx64.obj rdtsc64.obj" 505 AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
478 OutputFile="$(OutDir)/testzlib.exe" 506 OutputFile="$(OutDir)/testzlib.exe"
479 LinkIncremental="1" 507 LinkIncremental="1"
480 GenerateDebugInformation="TRUE" 508 GenerateManifest="false"
509 GenerateDebugInformation="true"
481 SubSystem="1" 510 SubSystem="1"
482 OptimizeReferences="2" 511 OptimizeReferences="2"
483 EnableCOMDATFolding="2" 512 EnableCOMDATFolding="2"
484 OptimizeForWindows98="1" 513 OptimizeForWindows98="1"
485 TargetMachine="17" 514 TargetMachine="5"
486 /> 515 />
487 <Tool 516 <Tool
488 Name="VCALinkTool" 517 Name="VCALinkTool"
@@ -497,6 +526,12 @@
497 Name="VCBscMakeTool" 526 Name="VCBscMakeTool"
498 /> 527 />
499 <Tool 528 <Tool
529 Name="VCFxCopTool"
530 />
531 <Tool
532 Name="VCAppVerifierTool"
533 />
534 <Tool
500 Name="VCWebDeploymentTool" 535 Name="VCWebDeploymentTool"
501 /> 536 />
502 <Tool 537 <Tool
@@ -512,113 +547,7 @@
512 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" 547 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
513 > 548 >
514 <File 549 <File
515 RelativePath=".\adler32.c" 550 RelativePath="..\..\testzlib\testzlib.c"
516 >
517 </File>
518 <File
519 RelativePath=".\compress.c"
520 >
521 </File>
522 <File
523 RelativePath=".\crc32.c"
524 >
525 </File>
526 <File
527 RelativePath=".\deflate.c"
528 >
529 </File>
530 <File
531 RelativePath=".\gvmat32c.c"
532 >
533 <FileConfiguration
534 Name="Debug|Win64 (AMD64)"
535 ExcludedFromBuild="TRUE"
536 >
537 <Tool
538 Name="VCCLCompilerTool"
539 />
540 </FileConfiguration>
541 <FileConfiguration
542 Name="Release|Win64 (AMD64)"
543 ExcludedFromBuild="TRUE"
544 >
545 <Tool
546 Name="VCCLCompilerTool"
547 />
548 </FileConfiguration>
549 <FileConfiguration
550 Name="ReleaseAsm|Win32"
551 >
552 <Tool
553 Name="VCCLCompilerTool"
554 />
555 </FileConfiguration>
556 <FileConfiguration
557 Name="ReleaseAsm|Win64 (AMD64)"
558 ExcludedFromBuild="TRUE"
559 >
560 <Tool
561 Name="VCCLCompilerTool"
562 />
563 </FileConfiguration>
564 </File>
565 <File
566 RelativePath=".\infback.c"
567 >
568 </File>
569 <File
570 RelativePath=".\inffas8664.c"
571 >
572 <FileConfiguration
573 Name="Debug|Win32"
574 ExcludedFromBuild="TRUE"
575 >
576 <Tool
577 Name="VCCLCompilerTool"
578 />
579 </FileConfiguration>
580 <FileConfiguration
581 Name="Release|Win32"
582 >
583 <Tool
584 Name="VCCLCompilerTool"
585 />
586 </FileConfiguration>
587 <FileConfiguration
588 Name="ReleaseAsm|Win32"
589 ExcludedFromBuild="TRUE"
590 >
591 <Tool
592 Name="VCCLCompilerTool"
593 />
594 </FileConfiguration>
595 </File>
596 <File
597 RelativePath=".\inffast.c"
598 >
599 </File>
600 <File
601 RelativePath=".\inflate.c"
602 >
603 </File>
604 <File
605 RelativePath=".\inftrees.c"
606 >
607 </File>
608 <File
609 RelativePath="testzlib.c"
610 >
611 </File>
612 <File
613 RelativePath=".\trees.c"
614 >
615 </File>
616 <File
617 RelativePath=".\uncompr.c"
618 >
619 </File>
620 <File
621 RelativePath=".\zutil.c"
622 > 551 >
623 </File> 552 </File>
624 </Filter> 553 </Filter>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 07:27:45 +0000