diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:32:36 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:32:36 -0700 |
commit | 67cc20d0041a32bee12bd9eb20ae218f91b73f77 (patch) | |
tree | d7e1b94bd15c30efd57cf9036f5fe89306b6bba0 /contrib/vstudio | |
parent | 7751bd4c715ea8478113e34b49b5a794a4642e8e (diff) | |
download | zlib-1.2.4-pre1.tar.gz zlib-1.2.4-pre1.tar.bz2 zlib-1.2.4-pre1.zip |
zlib 1.2.4-pre1v1.2.4-pre1
Diffstat (limited to 'contrib/vstudio')
-rw-r--r-- | contrib/vstudio/readme.txt | 40 | ||||
-rw-r--r-- | contrib/vstudio/vc10/testzlib.vcxproj | 12 | ||||
-rw-r--r-- | contrib/vstudio/vc10/testzlib.vcxproj.filters | 3 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlib.rc | 10 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibstat.vcxproj | 11 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibstat.vcxproj.filters | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.def | 68 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.sln | 16 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.vcxproj | 16 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.vcxproj.filters | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc7/zlibvc.def | 114 | ||||
-rw-r--r-- | contrib/vstudio/vc8/zlibvc.def | 114 | ||||
-rw-r--r-- | contrib/vstudio/vc9/testzlib.vcproj | 274 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlib.rc | 10 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibstat.vcproj | 170 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.def | 68 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.sln | 16 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.vcproj | 247 |
18 files changed, 359 insertions, 842 deletions
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index a7b7247..904888b 100644 --- a/contrib/vstudio/readme.txt +++ b/contrib/vstudio/readme.txt | |||
@@ -1,8 +1,8 @@ | |||
1 | Building instructions for the DLL versions of Zlib 1.2.3 | 1 | Building instructions for the DLL versions of Zlib 1.2.4 |
2 | ======================================================== | 2 | ======================================================== |
3 | 3 | ||
4 | This directory contains projects that build zlib and minizip using | 4 | This directory contains projects that build zlib and minizip using |
5 | Microsoft Visual C++ 7.0/7.1/8.0/9.0/10.0, and Visual C++ . | 5 | Microsoft Visual C++ 9.0/10.0, and Visual C++ . |
6 | 6 | ||
7 | You don't need to build these projects yourself. You can download the | 7 | You don't need to build these projects yourself. You can download the |
8 | binaries from: | 8 | binaries from: |
@@ -15,51 +15,17 @@ bld_ml64.bat in contrib\masmx64 | |||
15 | bld_ml32.bat in contrib\masmx86 | 15 | bld_ml32.bat in contrib\masmx86 |
16 | 16 | ||
17 | 17 | ||
18 | Build instructions for Visual Studio 7.x (32 bits) | ||
19 | -------------------------------------------------- | ||
20 | - Uncompress current zlib, including all contrib/* files | ||
21 | - Download the crtdll library from | ||
22 | http://www.winimage.com/zLibDll/crtdll.zip | ||
23 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc7. | ||
24 | - Open contrib\vstudio\vc7\zlibvc.sln with Microsoft Visual C++ 7.x | ||
25 | (Visual Studio .Net 2002 or 2003). | ||
26 | |||
27 | Build instructions for Visual Studio 2005 (32 bits or 64 bits) | ||
28 | -------------------------------------------------------------- | ||
29 | - Uncompress current zlib, including all contrib/* files | ||
30 | - For 32 bits only: download the crtdll library from | ||
31 | http://www.winimage.com/zLibDll/crtdll.zip | ||
32 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8. | ||
33 | - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 2005 | ||
34 | |||
35 | Build instructions for Visual Studio 2005 64 bits, PSDK compiler | ||
36 | ---------------------------------------------------------------- | ||
37 | at the time of writing this text file, Visual Studio 2005 (and | ||
38 | Microsoft Visual C++ 8.0) is on the beta 2 stage. | ||
39 | Using you can get the free 64 bits compiler from Platform SDK, | ||
40 | which is NOT a beta, and compile using the Visual studio 2005 IDE | ||
41 | see http://www.winimage.com/misc/sdk64onvs2005/ for instruction | ||
42 | |||
43 | - Uncompress current zlib, including all contrib/* files | ||
44 | - start Visual Studio 2005 from a platform SDK command prompt, using | ||
45 | the /useenv switch | ||
46 | - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 2005 | ||
47 | 18 | ||
48 | 19 | ||
49 | Build instructions for Visual Studio 2008 (32 bits or 64 bits) | 20 | Build instructions for Visual Studio 2008 (32 bits or 64 bits) |
50 | -------------------------------------------------------------- | 21 | -------------------------------------------------------------- |
51 | - Uncompress current zlib, including all contrib/* files | 22 | - Uncompress current zlib, including all contrib/* files |
52 | - For 32 bits only: download the crtdll library from | ||
53 | http://www.winimage.com/zLibDll/crtdll.zip | ||
54 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc9. | ||
55 | - Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0 | 23 | - Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0 |
24 | - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32" | ||
56 | 25 | ||
57 | Build instructions for Visual Studio 2010 (32 bits or 64 bits) | 26 | Build instructions for Visual Studio 2010 (32 bits or 64 bits) |
58 | -------------------------------------------------------------- | 27 | -------------------------------------------------------------- |
59 | - Uncompress current zlib, including all contrib/* files | 28 | - Uncompress current zlib, including all contrib/* files |
60 | - For 32 bits only: download the crtdll library from | ||
61 | http://www.winimage.com/zLibDll/crtdll.zip | ||
62 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc10. | ||
63 | - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0 | 29 | - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0 |
64 | 30 | ||
65 | 31 | ||
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj b/contrib/vstudio/vc10/testzlib.vcxproj index 9810412..9088d17 100644 --- a/contrib/vstudio/vc10/testzlib.vcxproj +++ b/contrib/vstudio/vc10/testzlib.vcxproj | |||
@@ -194,7 +194,7 @@ | |||
194 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | 194 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
195 | </ClCompile> | 195 | </ClCompile> |
196 | <Link> | 196 | <Link> |
197 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 197 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> |
198 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | 198 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> |
199 | <GenerateDebugInformation>true</GenerateDebugInformation> | 199 | <GenerateDebugInformation>true</GenerateDebugInformation> |
200 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | 200 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> |
@@ -254,7 +254,7 @@ | |||
254 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 254 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
255 | </ClCompile> | 255 | </ClCompile> |
256 | <Link> | 256 | <Link> |
257 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 257 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> |
258 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | 258 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> |
259 | <GenerateDebugInformation>true</GenerateDebugInformation> | 259 | <GenerateDebugInformation>true</GenerateDebugInformation> |
260 | <SubSystem>Console</SubSystem> | 260 | <SubSystem>Console</SubSystem> |
@@ -397,14 +397,6 @@ | |||
397 | <ClCompile Include="..\..\..\compress.c" /> | 397 | <ClCompile Include="..\..\..\compress.c" /> |
398 | <ClCompile Include="..\..\..\crc32.c" /> | 398 | <ClCompile Include="..\..\..\crc32.c" /> |
399 | <ClCompile Include="..\..\..\deflate.c" /> | 399 | <ClCompile Include="..\..\..\deflate.c" /> |
400 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
401 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
402 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> | ||
403 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
404 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild> | ||
405 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
406 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> | ||
407 | </ClCompile> | ||
408 | <ClCompile Include="..\..\..\infback.c" /> | 400 | <ClCompile Include="..\..\..\infback.c" /> |
409 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | 401 | <ClCompile Include="..\..\masmx64\inffas8664.c"> |
410 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | 402 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> |
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.filters b/contrib/vstudio/vc10/testzlib.vcxproj.filters index a0d9b23..249daa8 100644 --- a/contrib/vstudio/vc10/testzlib.vcxproj.filters +++ b/contrib/vstudio/vc10/testzlib.vcxproj.filters | |||
@@ -27,9 +27,6 @@ | |||
27 | <ClCompile Include="..\..\..\deflate.c"> | 27 | <ClCompile Include="..\..\..\deflate.c"> |
28 | <Filter>Source Files</Filter> | 28 | <Filter>Source Files</Filter> |
29 | </ClCompile> | 29 | </ClCompile> |
30 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
31 | <Filter>Source Files</Filter> | ||
32 | </ClCompile> | ||
33 | <ClCompile Include="..\..\..\infback.c"> | 30 | <ClCompile Include="..\..\..\infback.c"> |
34 | <Filter>Source Files</Filter> | 31 | <Filter>Source Files</Filter> |
35 | </ClCompile> | 32 | </ClCompile> |
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc index 72cb8b4..23802d8 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 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1,2,3,0 | 5 | FILEVERSION 1,2,4,0 |
6 | PRODUCTVERSION 1,2,3,0 | 6 | PRODUCTVERSION 1,2,4,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 |
@@ -16,13 +16,13 @@ BEGIN | |||
16 | //language ID = U.S. English, char set = Windows, Multilingual | 16 | //language ID = U.S. English, char set = Windows, Multilingual |
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.3.0\0" | 20 | VALUE "FileVersion", "1.2.4.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" |
24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
25 | VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0" |
26 | END | 26 | END |
27 | END | 27 | END |
28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj index fbf6c1b..2682fca 100644 --- a/contrib/vstudio/vc10/zlibstat.vcxproj +++ b/contrib/vstudio/vc10/zlibstat.vcxproj | |||
@@ -206,7 +206,7 @@ | |||
206 | </ResourceCompile> | 206 | </ResourceCompile> |
207 | <Lib> | 207 | <Lib> |
208 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | 208 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> |
209 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 209 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> |
210 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 210 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
211 | <SuppressStartupBanner>true</SuppressStartupBanner> | 211 | <SuppressStartupBanner>true</SuppressStartupBanner> |
212 | </Lib> | 212 | </Lib> |
@@ -422,16 +422,7 @@ | |||
422 | <ClCompile Include="..\..\..\compress.c" /> | 422 | <ClCompile Include="..\..\..\compress.c" /> |
423 | <ClCompile Include="..\..\..\crc32.c" /> | 423 | <ClCompile Include="..\..\..\crc32.c" /> |
424 | <ClCompile Include="..\..\..\deflate.c" /> | 424 | <ClCompile Include="..\..\..\deflate.c" /> |
425 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
426 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
427 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> | ||
428 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
429 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild> | ||
430 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
431 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> | ||
432 | </ClCompile> | ||
433 | <ClCompile Include="..\..\..\gzclose.c" /> | 425 | <ClCompile Include="..\..\..\gzclose.c" /> |
434 | <ClCompile Include="..\..\..\gzio.c" /> | ||
435 | <ClCompile Include="..\..\..\gzlib.c" /> | 426 | <ClCompile Include="..\..\..\gzlib.c" /> |
436 | <ClCompile Include="..\..\..\gzread.c" /> | 427 | <ClCompile Include="..\..\..\gzread.c" /> |
437 | <ClCompile Include="..\..\..\gzwrite.c" /> | 428 | <ClCompile Include="..\..\..\gzwrite.c" /> |
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/contrib/vstudio/vc10/zlibstat.vcxproj.filters index f676c2d..c8c7f7e 100644 --- a/contrib/vstudio/vc10/zlibstat.vcxproj.filters +++ b/contrib/vstudio/vc10/zlibstat.vcxproj.filters | |||
@@ -18,15 +18,9 @@ | |||
18 | <ClCompile Include="..\..\..\deflate.c"> | 18 | <ClCompile Include="..\..\..\deflate.c"> |
19 | <Filter>Source Files</Filter> | 19 | <Filter>Source Files</Filter> |
20 | </ClCompile> | 20 | </ClCompile> |
21 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
22 | <Filter>Source Files</Filter> | ||
23 | </ClCompile> | ||
24 | <ClCompile Include="..\..\..\gzclose.c"> | 21 | <ClCompile Include="..\..\..\gzclose.c"> |
25 | <Filter>Source Files</Filter> | 22 | <Filter>Source Files</Filter> |
26 | </ClCompile> | 23 | </ClCompile> |
27 | <ClCompile Include="..\..\..\gzio.c"> | ||
28 | <Filter>Source Files</Filter> | ||
29 | </ClCompile> | ||
30 | <ClCompile Include="..\..\..\gzlib.c"> | 24 | <ClCompile Include="..\..\..\gzlib.c"> |
31 | <Filter>Source Files</Filter> | 25 | <Filter>Source Files</Filter> |
32 | </ClCompile> | 26 | </ClCompile> |
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index 0b6a9e9..b3b7cab 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def | |||
@@ -1,7 +1,7 @@ | |||
1 | LIBRARY | ||
2 | ; zlib data compression and ZIP file I/O library | ||
1 | 3 | ||
2 | VERSION 1.23 | 4 | VERSION 1.24 |
3 | |||
4 | HEAPSIZE 1048576,8192 | ||
5 | 5 | ||
6 | EXPORTS | 6 | EXPORTS |
7 | adler32 @1 | 7 | adler32 @1 |
@@ -90,25 +90,47 @@ EXPORTS | |||
90 | unzGoToFilePos @101 | 90 | unzGoToFilePos @101 |
91 | 91 | ||
92 | fill_win32_filefunc @110 | 92 | fill_win32_filefunc @110 |
93 | fill_win32_filefunc64 @111 | ||
94 | fill_win32_filefunc64A @112 | ||
95 | fill_win32_filefunc64W @113 | ||
96 | 93 | ||
97 | ; quick hack by hkuno@microhouse.co.jp | 94 | ; zlibwapi v1.2.4 added: |
98 | unzOpen64 @120 | 95 | fill_win32_filefunc64 @111 |
99 | unzOpen2_64 @121 | 96 | fill_win32_filefunc64A @112 |
100 | unzGetGlobalInfo64 @122 | 97 | fill_win32_filefunc64W @113 |
101 | unzGetCurrentFileInfo64 @124 | 98 | |
102 | unzGetCurrentFileZStreamPos64 @125 | 99 | unzOpen64 @120 |
103 | unztell64 @126 | 100 | unzOpen2_64 @121 |
104 | unzGetFilePos64 @127 | 101 | unzGetGlobalInfo64 @122 |
105 | unzGoToFilePos64 @128 | 102 | unzGetCurrentFileInfo64 @124 |
103 | unzGetCurrentFileZStreamPos64 @125 | ||
104 | unztell64 @126 | ||
105 | unzGetFilePos64 @127 | ||
106 | unzGoToFilePos64 @128 | ||
107 | |||
108 | zipOpen64 @130 | ||
109 | zipOpen2_64 @131 | ||
110 | zipOpenNewFileInZip64 @132 | ||
111 | zipOpenNewFileInZip2_64 @133 | ||
112 | zipOpenNewFileInZip3_64 @134 | ||
113 | zipOpenNewFileInZip4_64 @135 | ||
114 | zipCloseFileInZipRaw64 @136 | ||
106 | 115 | ||
107 | zipOpen64 @130 | 116 | ; zlib1 v1.2.4 added: |
108 | zipOpen2_64 @131 | 117 | adler32_combine @140 |
109 | zipOpenNewFileInZip64 @132 | 118 | adler32_combine64 @141 |
110 | zipOpenNewFileInZip2_64 @133 | 119 | crc32_combine @142 |
111 | zipOpenNewFileInZip3_64 @134 | 120 | crc32_combine64 @143 |
112 | zipOpenNewFileInZip4_64 @135 | 121 | deflateSetHeader @144 |
113 | zipCloseFileInZipRaw64 @136 | 122 | deflateTune @145 |
114 | ; end hack | 123 | gzbuffer @146 |
124 | gzclose_r @147 | ||
125 | gzclose_w @148 | ||
126 | gzdirect @149 | ||
127 | gzoffset @150 | ||
128 | gzoffset64 @151 | ||
129 | gzopen64 @152 | ||
130 | gzseek64 @153 | ||
131 | gztell64 @154 | ||
132 | inflateGetHeader @156 | ||
133 | inflateMark @157 | ||
134 | inflatePrime @158 | ||
135 | inflateReset2 @159 | ||
136 | inflateUndermine @160 | ||
diff --git a/contrib/vstudio/vc10/zlibvc.sln b/contrib/vstudio/vc10/zlibvc.sln index 6d2ef64..6f6ffd5 100644 --- a/contrib/vstudio/vc10/zlibvc.sln +++ b/contrib/vstudio/vc10/zlibvc.sln | |||
@@ -36,8 +36,8 @@ Global | |||
36 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium | 36 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium |
37 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 | 37 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 |
38 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 | 38 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 |
39 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64 | 39 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64 |
40 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = ReleaseWithoutAsm|x64 | 40 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64 |
41 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium | 41 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium |
42 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium | 42 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium |
43 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | 43 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 |
@@ -94,8 +94,8 @@ Global | |||
94 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64 | 94 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64 |
95 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | 95 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium |
96 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | 96 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium |
97 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | 97 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 |
98 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | 98 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 |
99 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium | 99 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium |
100 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium | 100 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium |
101 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 | 101 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 |
@@ -110,8 +110,8 @@ Global | |||
110 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 | 110 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 |
111 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | 111 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium |
112 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | 112 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium |
113 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | 113 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 |
114 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | 114 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 |
115 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium | 115 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium |
116 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium | 116 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium |
117 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32 | 117 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32 |
@@ -126,8 +126,8 @@ Global | |||
126 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64 | 126 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64 |
127 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | 127 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium |
128 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | 128 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium |
129 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | 129 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 |
130 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | 130 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 |
131 | EndGlobalSection | 131 | EndGlobalSection |
132 | GlobalSection(SolutionProperties) = preSolution | 132 | GlobalSection(SolutionProperties) = preSolution |
133 | HideSolutionNode = FALSE | 133 | HideSolutionNode = FALSE |
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj index e1067fa..9862398 100644 --- a/contrib/vstudio/vc10/zlibvc.vcxproj +++ b/contrib/vstudio/vc10/zlibvc.vcxproj | |||
@@ -213,7 +213,7 @@ | |||
213 | </ResourceCompile> | 213 | </ResourceCompile> |
214 | <Link> | 214 | <Link> |
215 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 215 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
216 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 216 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> |
217 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 217 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
218 | <SuppressStartupBanner>true</SuppressStartupBanner> | 218 | <SuppressStartupBanner>true</SuppressStartupBanner> |
219 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 219 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -291,7 +291,7 @@ | |||
291 | <StringPooling>true</StringPooling> | 291 | <StringPooling>true</StringPooling> |
292 | <ExceptionHandling> | 292 | <ExceptionHandling> |
293 | </ExceptionHandling> | 293 | </ExceptionHandling> |
294 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 294 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
295 | <BufferSecurityCheck>false</BufferSecurityCheck> | 295 | <BufferSecurityCheck>false</BufferSecurityCheck> |
296 | <FunctionLevelLinking>true</FunctionLevelLinking> | 296 | <FunctionLevelLinking>true</FunctionLevelLinking> |
297 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | 297 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> |
@@ -310,7 +310,7 @@ | |||
310 | </ResourceCompile> | 310 | </ResourceCompile> |
311 | <Link> | 311 | <Link> |
312 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 312 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
313 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 313 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> |
314 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 314 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
315 | <SuppressStartupBanner>true</SuppressStartupBanner> | 315 | <SuppressStartupBanner>true</SuppressStartupBanner> |
316 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 316 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
@@ -598,17 +598,7 @@ | |||
598 | <ClCompile Include="..\..\..\compress.c" /> | 598 | <ClCompile Include="..\..\..\compress.c" /> |
599 | <ClCompile Include="..\..\..\crc32.c" /> | 599 | <ClCompile Include="..\..\..\crc32.c" /> |
600 | <ClCompile Include="..\..\..\deflate.c" /> | 600 | <ClCompile Include="..\..\..\deflate.c" /> |
601 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
602 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
603 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> | ||
604 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
605 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
606 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild> | ||
607 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
608 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> | ||
609 | </ClCompile> | ||
610 | <ClCompile Include="..\..\..\gzclose.c" /> | 601 | <ClCompile Include="..\..\..\gzclose.c" /> |
611 | <ClCompile Include="..\..\..\gzio.c" /> | ||
612 | <ClCompile Include="..\..\..\gzlib.c" /> | 602 | <ClCompile Include="..\..\..\gzlib.c" /> |
613 | <ClCompile Include="..\..\..\gzread.c" /> | 603 | <ClCompile Include="..\..\..\gzread.c" /> |
614 | <ClCompile Include="..\..\..\gzwrite.c" /> | 604 | <ClCompile Include="..\..\..\gzwrite.c" /> |
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/contrib/vstudio/vc10/zlibvc.vcxproj.filters index 7b595c4..180b71c 100644 --- a/contrib/vstudio/vc10/zlibvc.vcxproj.filters +++ b/contrib/vstudio/vc10/zlibvc.vcxproj.filters | |||
@@ -27,15 +27,9 @@ | |||
27 | <ClCompile Include="..\..\..\deflate.c"> | 27 | <ClCompile Include="..\..\..\deflate.c"> |
28 | <Filter>Source Files</Filter> | 28 | <Filter>Source Files</Filter> |
29 | </ClCompile> | 29 | </ClCompile> |
30 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
31 | <Filter>Source Files</Filter> | ||
32 | </ClCompile> | ||
33 | <ClCompile Include="..\..\..\gzclose.c"> | 30 | <ClCompile Include="..\..\..\gzclose.c"> |
34 | <Filter>Source Files</Filter> | 31 | <Filter>Source Files</Filter> |
35 | </ClCompile> | 32 | </ClCompile> |
36 | <ClCompile Include="..\..\..\gzio.c"> | ||
37 | <Filter>Source Files</Filter> | ||
38 | </ClCompile> | ||
39 | <ClCompile Include="..\..\..\gzlib.c"> | 33 | <ClCompile Include="..\..\..\gzlib.c"> |
40 | <Filter>Source Files</Filter> | 34 | <Filter>Source Files</Filter> |
41 | </ClCompile> | 35 | </ClCompile> |
diff --git a/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc7/zlibvc.def deleted file mode 100644 index 0b6a9e9..0000000 --- a/contrib/vstudio/vc7/zlibvc.def +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | |||
2 | VERSION 1.23 | ||
3 | |||
4 | HEAPSIZE 1048576,8192 | ||
5 | |||
6 | EXPORTS | ||
7 | adler32 @1 | ||
8 | compress @2 | ||
9 | crc32 @3 | ||
10 | deflate @4 | ||
11 | deflateCopy @5 | ||
12 | deflateEnd @6 | ||
13 | deflateInit2_ @7 | ||
14 | deflateInit_ @8 | ||
15 | deflateParams @9 | ||
16 | deflateReset @10 | ||
17 | deflateSetDictionary @11 | ||
18 | gzclose @12 | ||
19 | gzdopen @13 | ||
20 | gzerror @14 | ||
21 | gzflush @15 | ||
22 | gzopen @16 | ||
23 | gzread @17 | ||
24 | gzwrite @18 | ||
25 | inflate @19 | ||
26 | inflateEnd @20 | ||
27 | inflateInit2_ @21 | ||
28 | inflateInit_ @22 | ||
29 | inflateReset @23 | ||
30 | inflateSetDictionary @24 | ||
31 | inflateSync @25 | ||
32 | uncompress @26 | ||
33 | zlibVersion @27 | ||
34 | gzprintf @28 | ||
35 | gzputc @29 | ||
36 | gzgetc @30 | ||
37 | gzseek @31 | ||
38 | gzrewind @32 | ||
39 | gztell @33 | ||
40 | gzeof @34 | ||
41 | gzsetparams @35 | ||
42 | zError @36 | ||
43 | inflateSyncPoint @37 | ||
44 | get_crc_table @38 | ||
45 | compress2 @39 | ||
46 | gzputs @40 | ||
47 | gzgets @41 | ||
48 | inflateCopy @42 | ||
49 | inflateBackInit_ @43 | ||
50 | inflateBack @44 | ||
51 | inflateBackEnd @45 | ||
52 | compressBound @46 | ||
53 | deflateBound @47 | ||
54 | gzclearerr @48 | ||
55 | gzungetc @49 | ||
56 | zlibCompileFlags @50 | ||
57 | deflatePrime @51 | ||
58 | |||
59 | unzOpen @61 | ||
60 | unzClose @62 | ||
61 | unzGetGlobalInfo @63 | ||
62 | unzGetCurrentFileInfo @64 | ||
63 | unzGoToFirstFile @65 | ||
64 | unzGoToNextFile @66 | ||
65 | unzOpenCurrentFile @67 | ||
66 | unzReadCurrentFile @68 | ||
67 | unzOpenCurrentFile3 @69 | ||
68 | unztell @70 | ||
69 | unzeof @71 | ||
70 | unzCloseCurrentFile @72 | ||
71 | unzGetGlobalComment @73 | ||
72 | unzStringFileNameCompare @74 | ||
73 | unzLocateFile @75 | ||
74 | unzGetLocalExtrafield @76 | ||
75 | unzOpen2 @77 | ||
76 | unzOpenCurrentFile2 @78 | ||
77 | unzOpenCurrentFilePassword @79 | ||
78 | |||
79 | zipOpen @80 | ||
80 | zipOpenNewFileInZip @81 | ||
81 | zipWriteInFileInZip @82 | ||
82 | zipCloseFileInZip @83 | ||
83 | zipClose @84 | ||
84 | zipOpenNewFileInZip2 @86 | ||
85 | zipCloseFileInZipRaw @87 | ||
86 | zipOpen2 @88 | ||
87 | zipOpenNewFileInZip3 @89 | ||
88 | |||
89 | unzGetFilePos @100 | ||
90 | unzGoToFilePos @101 | ||
91 | |||
92 | fill_win32_filefunc @110 | ||
93 | fill_win32_filefunc64 @111 | ||
94 | fill_win32_filefunc64A @112 | ||
95 | fill_win32_filefunc64W @113 | ||
96 | |||
97 | ; quick hack by hkuno@microhouse.co.jp | ||
98 | unzOpen64 @120 | ||
99 | unzOpen2_64 @121 | ||
100 | unzGetGlobalInfo64 @122 | ||
101 | unzGetCurrentFileInfo64 @124 | ||
102 | unzGetCurrentFileZStreamPos64 @125 | ||
103 | unztell64 @126 | ||
104 | unzGetFilePos64 @127 | ||
105 | unzGoToFilePos64 @128 | ||
106 | |||
107 | zipOpen64 @130 | ||
108 | zipOpen2_64 @131 | ||
109 | zipOpenNewFileInZip64 @132 | ||
110 | zipOpenNewFileInZip2_64 @133 | ||
111 | zipOpenNewFileInZip3_64 @134 | ||
112 | zipOpenNewFileInZip4_64 @135 | ||
113 | zipCloseFileInZipRaw64 @136 | ||
114 | ; end hack | ||
diff --git a/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc8/zlibvc.def deleted file mode 100644 index 0b6a9e9..0000000 --- a/contrib/vstudio/vc8/zlibvc.def +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | |||
2 | VERSION 1.23 | ||
3 | |||
4 | HEAPSIZE 1048576,8192 | ||
5 | |||
6 | EXPORTS | ||
7 | adler32 @1 | ||
8 | compress @2 | ||
9 | crc32 @3 | ||
10 | deflate @4 | ||
11 | deflateCopy @5 | ||
12 | deflateEnd @6 | ||
13 | deflateInit2_ @7 | ||
14 | deflateInit_ @8 | ||
15 | deflateParams @9 | ||
16 | deflateReset @10 | ||
17 | deflateSetDictionary @11 | ||
18 | gzclose @12 | ||
19 | gzdopen @13 | ||
20 | gzerror @14 | ||
21 | gzflush @15 | ||
22 | gzopen @16 | ||
23 | gzread @17 | ||
24 | gzwrite @18 | ||
25 | inflate @19 | ||
26 | inflateEnd @20 | ||
27 | inflateInit2_ @21 | ||
28 | inflateInit_ @22 | ||
29 | inflateReset @23 | ||
30 | inflateSetDictionary @24 | ||
31 | inflateSync @25 | ||
32 | uncompress @26 | ||
33 | zlibVersion @27 | ||
34 | gzprintf @28 | ||
35 | gzputc @29 | ||
36 | gzgetc @30 | ||
37 | gzseek @31 | ||
38 | gzrewind @32 | ||
39 | gztell @33 | ||
40 | gzeof @34 | ||
41 | gzsetparams @35 | ||
42 | zError @36 | ||
43 | inflateSyncPoint @37 | ||
44 | get_crc_table @38 | ||
45 | compress2 @39 | ||
46 | gzputs @40 | ||
47 | gzgets @41 | ||
48 | inflateCopy @42 | ||
49 | inflateBackInit_ @43 | ||
50 | inflateBack @44 | ||
51 | inflateBackEnd @45 | ||
52 | compressBound @46 | ||
53 | deflateBound @47 | ||
54 | gzclearerr @48 | ||
55 | gzungetc @49 | ||
56 | zlibCompileFlags @50 | ||
57 | deflatePrime @51 | ||
58 | |||
59 | unzOpen @61 | ||
60 | unzClose @62 | ||
61 | unzGetGlobalInfo @63 | ||
62 | unzGetCurrentFileInfo @64 | ||
63 | unzGoToFirstFile @65 | ||
64 | unzGoToNextFile @66 | ||
65 | unzOpenCurrentFile @67 | ||
66 | unzReadCurrentFile @68 | ||
67 | unzOpenCurrentFile3 @69 | ||
68 | unztell @70 | ||
69 | unzeof @71 | ||
70 | unzCloseCurrentFile @72 | ||
71 | unzGetGlobalComment @73 | ||
72 | unzStringFileNameCompare @74 | ||
73 | unzLocateFile @75 | ||
74 | unzGetLocalExtrafield @76 | ||
75 | unzOpen2 @77 | ||
76 | unzOpenCurrentFile2 @78 | ||
77 | unzOpenCurrentFilePassword @79 | ||
78 | |||
79 | zipOpen @80 | ||
80 | zipOpenNewFileInZip @81 | ||
81 | zipWriteInFileInZip @82 | ||
82 | zipCloseFileInZip @83 | ||
83 | zipClose @84 | ||
84 | zipOpenNewFileInZip2 @86 | ||
85 | zipCloseFileInZipRaw @87 | ||
86 | zipOpen2 @88 | ||
87 | zipOpenNewFileInZip3 @89 | ||
88 | |||
89 | unzGetFilePos @100 | ||
90 | unzGoToFilePos @101 | ||
91 | |||
92 | fill_win32_filefunc @110 | ||
93 | fill_win32_filefunc64 @111 | ||
94 | fill_win32_filefunc64A @112 | ||
95 | fill_win32_filefunc64W @113 | ||
96 | |||
97 | ; quick hack by hkuno@microhouse.co.jp | ||
98 | unzOpen64 @120 | ||
99 | unzOpen2_64 @121 | ||
100 | unzGetGlobalInfo64 @122 | ||
101 | unzGetCurrentFileInfo64 @124 | ||
102 | unzGetCurrentFileZStreamPos64 @125 | ||
103 | unztell64 @126 | ||
104 | unzGetFilePos64 @127 | ||
105 | unzGoToFilePos64 @128 | ||
106 | |||
107 | zipOpen64 @130 | ||
108 | zipOpen2_64 @131 | ||
109 | zipOpenNewFileInZip64 @132 | ||
110 | zipOpenNewFileInZip2_64 @133 | ||
111 | zipOpenNewFileInZip3_64 @134 | ||
112 | zipOpenNewFileInZip4_64 @135 | ||
113 | zipCloseFileInZipRaw64 @136 | ||
114 | ; end hack | ||
diff --git a/contrib/vstudio/vc9/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj index 9ad07ae..9cb0bf8 100644 --- a/contrib/vstudio/vc9/testzlib.vcproj +++ b/contrib/vstudio/vc9/testzlib.vcproj | |||
@@ -1,7 +1,7 @@ | |||
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="9.00" | 4 | Version="9,00" |
5 | Name="testzlib" | 5 | Name="testzlib" |
6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" | 6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" |
7 | RootNamespace="testzlib" | 7 | RootNamespace="testzlib" |
@@ -71,7 +71,7 @@ | |||
71 | /> | 71 | /> |
72 | <Tool | 72 | <Tool |
73 | Name="VCLinkerTool" | 73 | Name="VCLinkerTool" |
74 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | 74 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj" |
75 | OutputFile="$(OutDir)/testzlib.exe" | 75 | OutputFile="$(OutDir)/testzlib.exe" |
76 | LinkIncremental="2" | 76 | LinkIncremental="2" |
77 | GenerateManifest="false" | 77 | GenerateManifest="false" |
@@ -105,12 +105,10 @@ | |||
105 | /> | 105 | /> |
106 | </Configuration> | 106 | </Configuration> |
107 | <Configuration | 107 | <Configuration |
108 | Name="ReleaseWithoutAsm|Win32" | 108 | Name="Debug|x64" |
109 | OutputDirectory="x86\TestZlib$(ConfigurationName)" | 109 | OutputDirectory="x64\TestZlib$(ConfigurationName)" |
110 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" | 110 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" |
111 | ConfigurationType="1" | 111 | ConfigurationType="1" |
112 | CharacterSet="2" | ||
113 | WholeProgramOptimization="1" | ||
114 | > | 112 | > |
115 | <Tool | 113 | <Tool |
116 | Name="VCPreBuildEventTool" | 114 | Name="VCPreBuildEventTool" |
@@ -129,21 +127,12 @@ | |||
129 | /> | 127 | /> |
130 | <Tool | 128 | <Tool |
131 | Name="VCCLCompilerTool" | 129 | Name="VCCLCompilerTool" |
132 | Optimization="2" | ||
133 | InlineFunctionExpansion="1" | ||
134 | OmitFramePointers="true" | ||
135 | AdditionalIncludeDirectories="..\..\.." | 130 | AdditionalIncludeDirectories="..\..\.." |
136 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 131 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
137 | StringPooling="true" | ||
138 | BasicRuntimeChecks="0" | 132 | BasicRuntimeChecks="0" |
139 | RuntimeLibrary="0" | 133 | RuntimeLibrary="3" |
140 | BufferSecurityCheck="false" | 134 | BufferSecurityCheck="false" |
141 | EnableFunctionLevelLinking="true" | ||
142 | UsePrecompiledHeader="0" | ||
143 | AssemblerListingLocation="$(IntDir)\" | 135 | AssemblerListingLocation="$(IntDir)\" |
144 | WarningLevel="3" | ||
145 | Detect64BitPortabilityProblems="true" | ||
146 | DebugInformationFormat="3" | ||
147 | /> | 136 | /> |
148 | <Tool | 137 | <Tool |
149 | Name="VCManagedResourceCompilerTool" | 138 | Name="VCManagedResourceCompilerTool" |
@@ -156,17 +145,8 @@ | |||
156 | /> | 145 | /> |
157 | <Tool | 146 | <Tool |
158 | Name="VCLinkerTool" | 147 | Name="VCLinkerTool" |
159 | OutputFile="$(OutDir)/testzlib.exe" | 148 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" |
160 | LinkIncremental="1" | ||
161 | GenerateManifest="false" | 149 | GenerateManifest="false" |
162 | GenerateDebugInformation="true" | ||
163 | SubSystem="1" | ||
164 | OptimizeReferences="2" | ||
165 | EnableCOMDATFolding="2" | ||
166 | OptimizeForWindows98="1" | ||
167 | RandomizedBaseAddress="1" | ||
168 | DataExecutionPrevention="0" | ||
169 | TargetMachine="1" | ||
170 | /> | 150 | /> |
171 | <Tool | 151 | <Tool |
172 | Name="VCALinkTool" | 152 | Name="VCALinkTool" |
@@ -191,12 +171,11 @@ | |||
191 | /> | 171 | /> |
192 | </Configuration> | 172 | </Configuration> |
193 | <Configuration | 173 | <Configuration |
194 | Name="Release|Win32" | 174 | Name="Debug|Itanium" |
195 | OutputDirectory="x86\TestZlib$(ConfigurationName)" | 175 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" |
196 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" | 176 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" |
197 | ConfigurationType="1" | 177 | ConfigurationType="1" |
198 | CharacterSet="2" | 178 | CharacterSet="2" |
199 | WholeProgramOptimization="1" | ||
200 | > | 179 | > |
201 | <Tool | 180 | <Tool |
202 | Name="VCPreBuildEventTool" | 181 | Name="VCPreBuildEventTool" |
@@ -212,20 +191,19 @@ | |||
212 | /> | 191 | /> |
213 | <Tool | 192 | <Tool |
214 | Name="VCMIDLTool" | 193 | Name="VCMIDLTool" |
194 | TargetEnvironment="2" | ||
215 | /> | 195 | /> |
216 | <Tool | 196 | <Tool |
217 | Name="VCCLCompilerTool" | 197 | Name="VCCLCompilerTool" |
218 | Optimization="2" | 198 | Optimization="0" |
219 | InlineFunctionExpansion="1" | ||
220 | OmitFramePointers="true" | ||
221 | AdditionalIncludeDirectories="..\..\.." | 199 | AdditionalIncludeDirectories="..\..\.." |
222 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 200 | PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
223 | StringPooling="true" | 201 | MinimalRebuild="true" |
224 | BasicRuntimeChecks="0" | 202 | BasicRuntimeChecks="0" |
225 | RuntimeLibrary="0" | 203 | RuntimeLibrary="3" |
226 | BufferSecurityCheck="false" | 204 | BufferSecurityCheck="false" |
227 | EnableFunctionLevelLinking="true" | ||
228 | UsePrecompiledHeader="0" | 205 | UsePrecompiledHeader="0" |
206 | AssemblerOutput="4" | ||
229 | AssemblerListingLocation="$(IntDir)\" | 207 | AssemblerListingLocation="$(IntDir)\" |
230 | WarningLevel="3" | 208 | WarningLevel="3" |
231 | Detect64BitPortabilityProblems="true" | 209 | Detect64BitPortabilityProblems="true" |
@@ -242,18 +220,13 @@ | |||
242 | /> | 220 | /> |
243 | <Tool | 221 | <Tool |
244 | Name="VCLinkerTool" | 222 | Name="VCLinkerTool" |
245 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
246 | OutputFile="$(OutDir)/testzlib.exe" | 223 | OutputFile="$(OutDir)/testzlib.exe" |
247 | LinkIncremental="1" | 224 | LinkIncremental="2" |
248 | GenerateManifest="false" | 225 | GenerateManifest="false" |
249 | GenerateDebugInformation="true" | 226 | GenerateDebugInformation="true" |
227 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
250 | SubSystem="1" | 228 | SubSystem="1" |
251 | OptimizeReferences="2" | 229 | TargetMachine="5" |
252 | EnableCOMDATFolding="2" | ||
253 | OptimizeForWindows98="1" | ||
254 | RandomizedBaseAddress="1" | ||
255 | DataExecutionPrevention="0" | ||
256 | TargetMachine="1" | ||
257 | /> | 230 | /> |
258 | <Tool | 231 | <Tool |
259 | Name="VCALinkTool" | 232 | Name="VCALinkTool" |
@@ -278,10 +251,12 @@ | |||
278 | /> | 251 | /> |
279 | </Configuration> | 252 | </Configuration> |
280 | <Configuration | 253 | <Configuration |
281 | Name="Debug|x64" | 254 | Name="ReleaseWithoutAsm|Win32" |
282 | OutputDirectory="x64\TestZlib$(ConfigurationName)" | 255 | OutputDirectory="x86\TestZlib$(ConfigurationName)" |
283 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" | 256 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" |
284 | ConfigurationType="1" | 257 | ConfigurationType="1" |
258 | CharacterSet="2" | ||
259 | WholeProgramOptimization="1" | ||
285 | > | 260 | > |
286 | <Tool | 261 | <Tool |
287 | Name="VCPreBuildEventTool" | 262 | Name="VCPreBuildEventTool" |
@@ -300,12 +275,21 @@ | |||
300 | /> | 275 | /> |
301 | <Tool | 276 | <Tool |
302 | Name="VCCLCompilerTool" | 277 | Name="VCCLCompilerTool" |
278 | Optimization="2" | ||
279 | InlineFunctionExpansion="1" | ||
280 | OmitFramePointers="true" | ||
303 | AdditionalIncludeDirectories="..\..\.." | 281 | AdditionalIncludeDirectories="..\..\.." |
304 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 282 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
283 | StringPooling="true" | ||
305 | BasicRuntimeChecks="0" | 284 | BasicRuntimeChecks="0" |
306 | RuntimeLibrary="3" | 285 | RuntimeLibrary="0" |
307 | BufferSecurityCheck="false" | 286 | BufferSecurityCheck="false" |
287 | EnableFunctionLevelLinking="true" | ||
288 | UsePrecompiledHeader="0" | ||
308 | AssemblerListingLocation="$(IntDir)\" | 289 | AssemblerListingLocation="$(IntDir)\" |
290 | WarningLevel="3" | ||
291 | Detect64BitPortabilityProblems="true" | ||
292 | DebugInformationFormat="3" | ||
309 | /> | 293 | /> |
310 | <Tool | 294 | <Tool |
311 | Name="VCManagedResourceCompilerTool" | 295 | Name="VCManagedResourceCompilerTool" |
@@ -318,8 +302,17 @@ | |||
318 | /> | 302 | /> |
319 | <Tool | 303 | <Tool |
320 | Name="VCLinkerTool" | 304 | Name="VCLinkerTool" |
321 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" | 305 | OutputFile="$(OutDir)/testzlib.exe" |
306 | LinkIncremental="1" | ||
322 | GenerateManifest="false" | 307 | GenerateManifest="false" |
308 | GenerateDebugInformation="true" | ||
309 | SubSystem="1" | ||
310 | OptimizeReferences="2" | ||
311 | EnableCOMDATFolding="2" | ||
312 | OptimizeForWindows98="1" | ||
313 | RandomizedBaseAddress="1" | ||
314 | DataExecutionPrevention="0" | ||
315 | TargetMachine="1" | ||
323 | /> | 316 | /> |
324 | <Tool | 317 | <Tool |
325 | Name="VCALinkTool" | 318 | Name="VCALinkTool" |
@@ -340,18 +333,15 @@ | |||
340 | Name="VCAppVerifierTool" | 333 | Name="VCAppVerifierTool" |
341 | /> | 334 | /> |
342 | <Tool | 335 | <Tool |
343 | Name="VCWebDeploymentTool" | ||
344 | /> | ||
345 | <Tool | ||
346 | Name="VCPostBuildEventTool" | 336 | Name="VCPostBuildEventTool" |
347 | /> | 337 | /> |
348 | </Configuration> | 338 | </Configuration> |
349 | <Configuration | 339 | <Configuration |
350 | Name="Debug|Itanium" | 340 | Name="ReleaseWithoutAsm|x64" |
351 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" | 341 | OutputDirectory="x64\TestZlib$(ConfigurationName)" |
352 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" | 342 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" |
353 | ConfigurationType="1" | 343 | ConfigurationType="1" |
354 | CharacterSet="2" | 344 | WholeProgramOptimization="1" |
355 | > | 345 | > |
356 | <Tool | 346 | <Tool |
357 | Name="VCPreBuildEventTool" | 347 | Name="VCPreBuildEventTool" |
@@ -367,23 +357,15 @@ | |||
367 | /> | 357 | /> |
368 | <Tool | 358 | <Tool |
369 | Name="VCMIDLTool" | 359 | Name="VCMIDLTool" |
370 | TargetEnvironment="2" | ||
371 | /> | 360 | /> |
372 | <Tool | 361 | <Tool |
373 | Name="VCCLCompilerTool" | 362 | Name="VCCLCompilerTool" |
374 | Optimization="0" | ||
375 | AdditionalIncludeDirectories="..\..\.." | 363 | AdditionalIncludeDirectories="..\..\.." |
376 | PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 364 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
377 | MinimalRebuild="true" | ||
378 | BasicRuntimeChecks="0" | 365 | BasicRuntimeChecks="0" |
379 | RuntimeLibrary="3" | 366 | RuntimeLibrary="2" |
380 | BufferSecurityCheck="false" | 367 | BufferSecurityCheck="false" |
381 | UsePrecompiledHeader="0" | ||
382 | AssemblerOutput="4" | ||
383 | AssemblerListingLocation="$(IntDir)\" | 368 | AssemblerListingLocation="$(IntDir)\" |
384 | WarningLevel="3" | ||
385 | Detect64BitPortabilityProblems="true" | ||
386 | DebugInformationFormat="3" | ||
387 | /> | 369 | /> |
388 | <Tool | 370 | <Tool |
389 | Name="VCManagedResourceCompilerTool" | 371 | Name="VCManagedResourceCompilerTool" |
@@ -396,13 +378,8 @@ | |||
396 | /> | 378 | /> |
397 | <Tool | 379 | <Tool |
398 | Name="VCLinkerTool" | 380 | Name="VCLinkerTool" |
399 | OutputFile="$(OutDir)/testzlib.exe" | 381 | AdditionalDependencies="" |
400 | LinkIncremental="2" | ||
401 | GenerateManifest="false" | 382 | GenerateManifest="false" |
402 | GenerateDebugInformation="true" | ||
403 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
404 | SubSystem="1" | ||
405 | TargetMachine="5" | ||
406 | /> | 383 | /> |
407 | <Tool | 384 | <Tool |
408 | Name="VCALinkTool" | 385 | Name="VCALinkTool" |
@@ -423,17 +400,15 @@ | |||
423 | Name="VCAppVerifierTool" | 400 | Name="VCAppVerifierTool" |
424 | /> | 401 | /> |
425 | <Tool | 402 | <Tool |
426 | Name="VCWebDeploymentTool" | ||
427 | /> | ||
428 | <Tool | ||
429 | Name="VCPostBuildEventTool" | 403 | Name="VCPostBuildEventTool" |
430 | /> | 404 | /> |
431 | </Configuration> | 405 | </Configuration> |
432 | <Configuration | 406 | <Configuration |
433 | Name="ReleaseWithoutAsm|x64" | 407 | Name="ReleaseWithoutAsm|Itanium" |
434 | OutputDirectory="x64\TestZlib$(ConfigurationName)" | 408 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" |
435 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" | 409 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" |
436 | ConfigurationType="1" | 410 | ConfigurationType="1" |
411 | CharacterSet="2" | ||
437 | WholeProgramOptimization="1" | 412 | WholeProgramOptimization="1" |
438 | > | 413 | > |
439 | <Tool | 414 | <Tool |
@@ -450,15 +425,25 @@ | |||
450 | /> | 425 | /> |
451 | <Tool | 426 | <Tool |
452 | Name="VCMIDLTool" | 427 | Name="VCMIDLTool" |
428 | TargetEnvironment="2" | ||
453 | /> | 429 | /> |
454 | <Tool | 430 | <Tool |
455 | Name="VCCLCompilerTool" | 431 | Name="VCCLCompilerTool" |
432 | Optimization="2" | ||
433 | InlineFunctionExpansion="1" | ||
434 | OmitFramePointers="true" | ||
456 | AdditionalIncludeDirectories="..\..\.." | 435 | AdditionalIncludeDirectories="..\..\.." |
457 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 436 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
437 | StringPooling="true" | ||
458 | BasicRuntimeChecks="0" | 438 | BasicRuntimeChecks="0" |
459 | RuntimeLibrary="2" | 439 | RuntimeLibrary="2" |
460 | BufferSecurityCheck="false" | 440 | BufferSecurityCheck="false" |
441 | EnableFunctionLevelLinking="true" | ||
442 | UsePrecompiledHeader="0" | ||
461 | AssemblerListingLocation="$(IntDir)\" | 443 | AssemblerListingLocation="$(IntDir)\" |
444 | WarningLevel="3" | ||
445 | Detect64BitPortabilityProblems="true" | ||
446 | DebugInformationFormat="3" | ||
462 | /> | 447 | /> |
463 | <Tool | 448 | <Tool |
464 | Name="VCManagedResourceCompilerTool" | 449 | Name="VCManagedResourceCompilerTool" |
@@ -471,8 +456,15 @@ | |||
471 | /> | 456 | /> |
472 | <Tool | 457 | <Tool |
473 | Name="VCLinkerTool" | 458 | Name="VCLinkerTool" |
474 | AdditionalDependencies="" | 459 | OutputFile="$(OutDir)/testzlib.exe" |
460 | LinkIncremental="1" | ||
475 | GenerateManifest="false" | 461 | GenerateManifest="false" |
462 | GenerateDebugInformation="true" | ||
463 | SubSystem="1" | ||
464 | OptimizeReferences="2" | ||
465 | EnableCOMDATFolding="2" | ||
466 | OptimizeForWindows98="1" | ||
467 | TargetMachine="5" | ||
476 | /> | 468 | /> |
477 | <Tool | 469 | <Tool |
478 | Name="VCALinkTool" | 470 | Name="VCALinkTool" |
@@ -493,16 +485,13 @@ | |||
493 | Name="VCAppVerifierTool" | 485 | Name="VCAppVerifierTool" |
494 | /> | 486 | /> |
495 | <Tool | 487 | <Tool |
496 | Name="VCWebDeploymentTool" | ||
497 | /> | ||
498 | <Tool | ||
499 | Name="VCPostBuildEventTool" | 488 | Name="VCPostBuildEventTool" |
500 | /> | 489 | /> |
501 | </Configuration> | 490 | </Configuration> |
502 | <Configuration | 491 | <Configuration |
503 | Name="ReleaseWithoutAsm|Itanium" | 492 | Name="Release|Win32" |
504 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" | 493 | OutputDirectory="x86\TestZlib$(ConfigurationName)" |
505 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" | 494 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" |
506 | ConfigurationType="1" | 495 | ConfigurationType="1" |
507 | CharacterSet="2" | 496 | CharacterSet="2" |
508 | WholeProgramOptimization="1" | 497 | WholeProgramOptimization="1" |
@@ -521,7 +510,6 @@ | |||
521 | /> | 510 | /> |
522 | <Tool | 511 | <Tool |
523 | Name="VCMIDLTool" | 512 | Name="VCMIDLTool" |
524 | TargetEnvironment="2" | ||
525 | /> | 513 | /> |
526 | <Tool | 514 | <Tool |
527 | Name="VCCLCompilerTool" | 515 | Name="VCCLCompilerTool" |
@@ -529,10 +517,10 @@ | |||
529 | InlineFunctionExpansion="1" | 517 | InlineFunctionExpansion="1" |
530 | OmitFramePointers="true" | 518 | OmitFramePointers="true" |
531 | AdditionalIncludeDirectories="..\..\.." | 519 | AdditionalIncludeDirectories="..\..\.." |
532 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 520 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
533 | StringPooling="true" | 521 | StringPooling="true" |
534 | BasicRuntimeChecks="0" | 522 | BasicRuntimeChecks="0" |
535 | RuntimeLibrary="2" | 523 | RuntimeLibrary="0" |
536 | BufferSecurityCheck="false" | 524 | BufferSecurityCheck="false" |
537 | EnableFunctionLevelLinking="true" | 525 | EnableFunctionLevelLinking="true" |
538 | UsePrecompiledHeader="0" | 526 | UsePrecompiledHeader="0" |
@@ -552,6 +540,7 @@ | |||
552 | /> | 540 | /> |
553 | <Tool | 541 | <Tool |
554 | Name="VCLinkerTool" | 542 | Name="VCLinkerTool" |
543 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj" | ||
555 | OutputFile="$(OutDir)/testzlib.exe" | 544 | OutputFile="$(OutDir)/testzlib.exe" |
556 | LinkIncremental="1" | 545 | LinkIncremental="1" |
557 | GenerateManifest="false" | 546 | GenerateManifest="false" |
@@ -560,7 +549,9 @@ | |||
560 | OptimizeReferences="2" | 549 | OptimizeReferences="2" |
561 | EnableCOMDATFolding="2" | 550 | EnableCOMDATFolding="2" |
562 | OptimizeForWindows98="1" | 551 | OptimizeForWindows98="1" |
563 | TargetMachine="5" | 552 | RandomizedBaseAddress="1" |
553 | DataExecutionPrevention="0" | ||
554 | TargetMachine="1" | ||
564 | /> | 555 | /> |
565 | <Tool | 556 | <Tool |
566 | Name="VCALinkTool" | 557 | Name="VCALinkTool" |
@@ -581,9 +572,6 @@ | |||
581 | Name="VCAppVerifierTool" | 572 | Name="VCAppVerifierTool" |
582 | /> | 573 | /> |
583 | <Tool | 574 | <Tool |
584 | Name="VCWebDeploymentTool" | ||
585 | /> | ||
586 | <Tool | ||
587 | Name="VCPostBuildEventTool" | 575 | Name="VCPostBuildEventTool" |
588 | /> | 576 | /> |
589 | </Configuration> | 577 | </Configuration> |
@@ -614,7 +602,7 @@ | |||
614 | AdditionalIncludeDirectories="..\..\.." | 602 | AdditionalIncludeDirectories="..\..\.." |
615 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 603 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
616 | BasicRuntimeChecks="0" | 604 | BasicRuntimeChecks="0" |
617 | RuntimeLibrary="2" | 605 | RuntimeLibrary="0" |
618 | BufferSecurityCheck="false" | 606 | BufferSecurityCheck="false" |
619 | AssemblerListingLocation="$(IntDir)\" | 607 | AssemblerListingLocation="$(IntDir)\" |
620 | /> | 608 | /> |
@@ -651,9 +639,6 @@ | |||
651 | Name="VCAppVerifierTool" | 639 | Name="VCAppVerifierTool" |
652 | /> | 640 | /> |
653 | <Tool | 641 | <Tool |
654 | Name="VCWebDeploymentTool" | ||
655 | /> | ||
656 | <Tool | ||
657 | Name="VCPostBuildEventTool" | 642 | Name="VCPostBuildEventTool" |
658 | /> | 643 | /> |
659 | </Configuration> | 644 | </Configuration> |
@@ -739,9 +724,6 @@ | |||
739 | Name="VCAppVerifierTool" | 724 | Name="VCAppVerifierTool" |
740 | /> | 725 | /> |
741 | <Tool | 726 | <Tool |
742 | Name="VCWebDeploymentTool" | ||
743 | /> | ||
744 | <Tool | ||
745 | Name="VCPostBuildEventTool" | 727 | Name="VCPostBuildEventTool" |
746 | /> | 728 | /> |
747 | </Configuration> | 729 | </Configuration> |
@@ -770,82 +752,6 @@ | |||
770 | > | 752 | > |
771 | </File> | 753 | </File> |
772 | <File | 754 | <File |
773 | RelativePath="..\..\masmx86\gvmat32c.c" | ||
774 | > | ||
775 | <FileConfiguration | ||
776 | Name="Debug|x64" | ||
777 | ExcludedFromBuild="true" | ||
778 | > | ||
779 | <Tool | ||
780 | Name="VCCLCompilerTool" | ||
781 | /> | ||
782 | </FileConfiguration> | ||
783 | <FileConfiguration | ||
784 | Name="Debug|Itanium" | ||
785 | ExcludedFromBuild="true" | ||
786 | > | ||
787 | <Tool | ||
788 | Name="VCCLCompilerTool" | ||
789 | /> | ||
790 | </FileConfiguration> | ||
791 | <FileConfiguration | ||
792 | Name="ReleaseWithoutAsm|x64" | ||
793 | ExcludedFromBuild="true" | ||
794 | > | ||
795 | <Tool | ||
796 | Name="VCCLCompilerTool" | ||
797 | /> | ||
798 | </FileConfiguration> | ||
799 | <FileConfiguration | ||
800 | Name="ReleaseWithoutAsm|Itanium" | ||
801 | ExcludedFromBuild="true" | ||
802 | > | ||
803 | <Tool | ||
804 | Name="VCCLCompilerTool" | ||
805 | /> | ||
806 | </FileConfiguration> | ||
807 | <FileConfiguration | ||
808 | Name="Release|x64" | ||
809 | ExcludedFromBuild="true" | ||
810 | > | ||
811 | <Tool | ||
812 | Name="VCCLCompilerTool" | ||
813 | /> | ||
814 | </FileConfiguration> | ||
815 | <FileConfiguration | ||
816 | Name="Release|Itanium" | ||
817 | ExcludedFromBuild="true" | ||
818 | > | ||
819 | <Tool | ||
820 | Name="VCCLCompilerTool" | ||
821 | /> | ||
822 | </FileConfiguration> | ||
823 | <FileConfiguration | ||
824 | Name="Debug|Win64 (AMD64)" | ||
825 | ExcludedFromBuild="TRUE" | ||
826 | > | ||
827 | <Tool | ||
828 | Name="VCCLCompilerTool" | ||
829 | /> | ||
830 | </FileConfiguration> | ||
831 | <FileConfiguration | ||
832 | Name="Release|Win64 (AMD64)" | ||
833 | ExcludedFromBuild="TRUE" | ||
834 | > | ||
835 | <Tool | ||
836 | Name="VCCLCompilerTool" | ||
837 | /> | ||
838 | </FileConfiguration> | ||
839 | <FileConfiguration | ||
840 | Name="ReleaseAsm|Win64 (AMD64)" | ||
841 | ExcludedFromBuild="TRUE" | ||
842 | > | ||
843 | <Tool | ||
844 | Name="VCCLCompilerTool" | ||
845 | /> | ||
846 | </FileConfiguration> | ||
847 | </File> | ||
848 | <File | ||
849 | RelativePath="..\..\..\infback.c" | 755 | RelativePath="..\..\..\infback.c" |
850 | > | 756 | > |
851 | </File> | 757 | </File> |
@@ -861,7 +767,7 @@ | |||
861 | /> | 767 | /> |
862 | </FileConfiguration> | 768 | </FileConfiguration> |
863 | <FileConfiguration | 769 | <FileConfiguration |
864 | Name="ReleaseWithoutAsm|Win32" | 770 | Name="Debug|Itanium" |
865 | ExcludedFromBuild="true" | 771 | ExcludedFromBuild="true" |
866 | > | 772 | > |
867 | <Tool | 773 | <Tool |
@@ -869,7 +775,7 @@ | |||
869 | /> | 775 | /> |
870 | </FileConfiguration> | 776 | </FileConfiguration> |
871 | <FileConfiguration | 777 | <FileConfiguration |
872 | Name="Release|Win32" | 778 | Name="ReleaseWithoutAsm|Win32" |
873 | ExcludedFromBuild="true" | 779 | ExcludedFromBuild="true" |
874 | > | 780 | > |
875 | <Tool | 781 | <Tool |
@@ -877,7 +783,7 @@ | |||
877 | /> | 783 | /> |
878 | </FileConfiguration> | 784 | </FileConfiguration> |
879 | <FileConfiguration | 785 | <FileConfiguration |
880 | Name="Debug|Itanium" | 786 | Name="ReleaseWithoutAsm|Itanium" |
881 | ExcludedFromBuild="true" | 787 | ExcludedFromBuild="true" |
882 | > | 788 | > |
883 | <Tool | 789 | <Tool |
@@ -885,7 +791,7 @@ | |||
885 | /> | 791 | /> |
886 | </FileConfiguration> | 792 | </FileConfiguration> |
887 | <FileConfiguration | 793 | <FileConfiguration |
888 | Name="ReleaseWithoutAsm|Itanium" | 794 | Name="Release|Win32" |
889 | ExcludedFromBuild="true" | 795 | ExcludedFromBuild="true" |
890 | > | 796 | > |
891 | <Tool | 797 | <Tool |
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc index 72cb8b4..23802d8 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 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1,2,3,0 | 5 | FILEVERSION 1,2,4,0 |
6 | PRODUCTVERSION 1,2,3,0 | 6 | PRODUCTVERSION 1,2,4,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 |
@@ -16,13 +16,13 @@ BEGIN | |||
16 | //language ID = U.S. English, char set = Windows, Multilingual | 16 | //language ID = U.S. English, char set = Windows, Multilingual |
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.3.0\0" | 20 | VALUE "FileVersion", "1.2.4.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" |
24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
25 | VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0" |
26 | END | 26 | END |
27 | END | 27 | END |
28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |
diff --git a/contrib/vstudio/vc9/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj index ff9813a..61c76c7 100644 --- a/contrib/vstudio/vc9/zlibstat.vcproj +++ b/contrib/vstudio/vc9/zlibstat.vcproj | |||
@@ -1,7 +1,7 @@ | |||
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="9.00" | 4 | Version="9,00" |
5 | Name="zlibstat" | 5 | Name="zlibstat" |
6 | ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | 6 | ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" |
7 | TargetFrameworkVersion="131072" | 7 | TargetFrameworkVersion="131072" |
@@ -94,9 +94,9 @@ | |||
94 | /> | 94 | /> |
95 | </Configuration> | 95 | </Configuration> |
96 | <Configuration | 96 | <Configuration |
97 | Name="Release|Win32" | 97 | Name="Debug|x64" |
98 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | 98 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" |
99 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | 99 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" |
100 | ConfigurationType="4" | 100 | ConfigurationType="4" |
101 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 101 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
102 | UseOfMFC="0" | 102 | UseOfMFC="0" |
@@ -116,23 +116,24 @@ | |||
116 | /> | 116 | /> |
117 | <Tool | 117 | <Tool |
118 | Name="VCMIDLTool" | 118 | Name="VCMIDLTool" |
119 | TargetEnvironment="3" | ||
119 | /> | 120 | /> |
120 | <Tool | 121 | <Tool |
121 | Name="VCCLCompilerTool" | 122 | Name="VCCLCompilerTool" |
122 | InlineFunctionExpansion="1" | 123 | Optimization="0" |
123 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 124 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
124 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF" | 125 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
125 | StringPooling="true" | ||
126 | ExceptionHandling="0" | 126 | ExceptionHandling="0" |
127 | RuntimeLibrary="0" | 127 | RuntimeLibrary="3" |
128 | BufferSecurityCheck="false" | 128 | BufferSecurityCheck="false" |
129 | EnableFunctionLevelLinking="true" | ||
130 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 129 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
131 | AssemblerListingLocation="$(IntDir)\" | 130 | AssemblerListingLocation="$(IntDir)\" |
132 | ObjectFile="$(IntDir)\" | 131 | ObjectFile="$(IntDir)\" |
133 | ProgramDataBaseFileName="$(OutDir)\" | 132 | ProgramDataBaseFileName="$(OutDir)\" |
134 | WarningLevel="3" | 133 | WarningLevel="3" |
135 | SuppressStartupBanner="true" | 134 | SuppressStartupBanner="true" |
135 | Detect64BitPortabilityProblems="true" | ||
136 | DebugInformationFormat="1" | ||
136 | /> | 137 | /> |
137 | <Tool | 138 | <Tool |
138 | Name="VCManagedResourceCompilerTool" | 139 | Name="VCManagedResourceCompilerTool" |
@@ -146,8 +147,7 @@ | |||
146 | /> | 147 | /> |
147 | <Tool | 148 | <Tool |
148 | Name="VCLibrarianTool" | 149 | Name="VCLibrarianTool" |
149 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | 150 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" |
150 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
151 | OutputFile="$(OutDir)\zlibstat.lib" | 151 | OutputFile="$(OutDir)\zlibstat.lib" |
152 | SuppressStartupBanner="true" | 152 | SuppressStartupBanner="true" |
153 | /> | 153 | /> |
@@ -168,9 +168,9 @@ | |||
168 | /> | 168 | /> |
169 | </Configuration> | 169 | </Configuration> |
170 | <Configuration | 170 | <Configuration |
171 | Name="ReleaseWithoutAsm|Win32" | 171 | Name="Debug|Itanium" |
172 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | 172 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" |
173 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | 173 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" |
174 | ConfigurationType="4" | 174 | ConfigurationType="4" |
175 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 175 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
176 | UseOfMFC="0" | 176 | UseOfMFC="0" |
@@ -190,23 +190,24 @@ | |||
190 | /> | 190 | /> |
191 | <Tool | 191 | <Tool |
192 | Name="VCMIDLTool" | 192 | Name="VCMIDLTool" |
193 | TargetEnvironment="2" | ||
193 | /> | 194 | /> |
194 | <Tool | 195 | <Tool |
195 | Name="VCCLCompilerTool" | 196 | Name="VCCLCompilerTool" |
196 | InlineFunctionExpansion="1" | 197 | Optimization="0" |
197 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 198 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
198 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 199 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
199 | StringPooling="true" | ||
200 | ExceptionHandling="0" | 200 | ExceptionHandling="0" |
201 | RuntimeLibrary="0" | 201 | RuntimeLibrary="3" |
202 | BufferSecurityCheck="false" | 202 | BufferSecurityCheck="false" |
203 | EnableFunctionLevelLinking="true" | ||
204 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 203 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
205 | AssemblerListingLocation="$(IntDir)\" | 204 | AssemblerListingLocation="$(IntDir)\" |
206 | ObjectFile="$(IntDir)\" | 205 | ObjectFile="$(IntDir)\" |
207 | ProgramDataBaseFileName="$(OutDir)\" | 206 | ProgramDataBaseFileName="$(OutDir)\" |
208 | WarningLevel="3" | 207 | WarningLevel="3" |
209 | SuppressStartupBanner="true" | 208 | SuppressStartupBanner="true" |
209 | Detect64BitPortabilityProblems="true" | ||
210 | DebugInformationFormat="1" | ||
210 | /> | 211 | /> |
211 | <Tool | 212 | <Tool |
212 | Name="VCManagedResourceCompilerTool" | 213 | Name="VCManagedResourceCompilerTool" |
@@ -220,7 +221,7 @@ | |||
220 | /> | 221 | /> |
221 | <Tool | 222 | <Tool |
222 | Name="VCLibrarianTool" | 223 | Name="VCLibrarianTool" |
223 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | 224 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" |
224 | OutputFile="$(OutDir)\zlibstat.lib" | 225 | OutputFile="$(OutDir)\zlibstat.lib" |
225 | SuppressStartupBanner="true" | 226 | SuppressStartupBanner="true" |
226 | /> | 227 | /> |
@@ -241,9 +242,9 @@ | |||
241 | /> | 242 | /> |
242 | </Configuration> | 243 | </Configuration> |
243 | <Configuration | 244 | <Configuration |
244 | Name="Debug|x64" | 245 | Name="Release|Win32" |
245 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | 246 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" |
246 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | 247 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" |
247 | ConfigurationType="4" | 248 | ConfigurationType="4" |
248 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 249 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
249 | UseOfMFC="0" | 250 | UseOfMFC="0" |
@@ -263,24 +264,23 @@ | |||
263 | /> | 264 | /> |
264 | <Tool | 265 | <Tool |
265 | Name="VCMIDLTool" | 266 | Name="VCMIDLTool" |
266 | TargetEnvironment="3" | ||
267 | /> | 267 | /> |
268 | <Tool | 268 | <Tool |
269 | Name="VCCLCompilerTool" | 269 | Name="VCCLCompilerTool" |
270 | Optimization="0" | 270 | InlineFunctionExpansion="1" |
271 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 271 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
272 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 272 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF" |
273 | StringPooling="true" | ||
273 | ExceptionHandling="0" | 274 | ExceptionHandling="0" |
274 | RuntimeLibrary="3" | 275 | RuntimeLibrary="0" |
275 | BufferSecurityCheck="false" | 276 | BufferSecurityCheck="false" |
277 | EnableFunctionLevelLinking="true" | ||
276 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 278 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
277 | AssemblerListingLocation="$(IntDir)\" | 279 | AssemblerListingLocation="$(IntDir)\" |
278 | ObjectFile="$(IntDir)\" | 280 | ObjectFile="$(IntDir)\" |
279 | ProgramDataBaseFileName="$(OutDir)\" | 281 | ProgramDataBaseFileName="$(OutDir)\" |
280 | WarningLevel="3" | 282 | WarningLevel="3" |
281 | SuppressStartupBanner="true" | 283 | SuppressStartupBanner="true" |
282 | Detect64BitPortabilityProblems="true" | ||
283 | DebugInformationFormat="1" | ||
284 | /> | 284 | /> |
285 | <Tool | 285 | <Tool |
286 | Name="VCManagedResourceCompilerTool" | 286 | Name="VCManagedResourceCompilerTool" |
@@ -294,7 +294,8 @@ | |||
294 | /> | 294 | /> |
295 | <Tool | 295 | <Tool |
296 | Name="VCLibrarianTool" | 296 | Name="VCLibrarianTool" |
297 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | 297 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" |
298 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj " | ||
298 | OutputFile="$(OutDir)\zlibstat.lib" | 299 | OutputFile="$(OutDir)\zlibstat.lib" |
299 | SuppressStartupBanner="true" | 300 | SuppressStartupBanner="true" |
300 | /> | 301 | /> |
@@ -315,9 +316,9 @@ | |||
315 | /> | 316 | /> |
316 | </Configuration> | 317 | </Configuration> |
317 | <Configuration | 318 | <Configuration |
318 | Name="Debug|Itanium" | 319 | Name="Release|x64" |
319 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | 320 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" |
320 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | 321 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" |
321 | ConfigurationType="4" | 322 | ConfigurationType="4" |
322 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 323 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
323 | UseOfMFC="0" | 324 | UseOfMFC="0" |
@@ -337,24 +338,24 @@ | |||
337 | /> | 338 | /> |
338 | <Tool | 339 | <Tool |
339 | Name="VCMIDLTool" | 340 | Name="VCMIDLTool" |
340 | TargetEnvironment="2" | 341 | TargetEnvironment="3" |
341 | /> | 342 | /> |
342 | <Tool | 343 | <Tool |
343 | Name="VCCLCompilerTool" | 344 | Name="VCCLCompilerTool" |
344 | Optimization="0" | 345 | InlineFunctionExpansion="1" |
345 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 346 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
346 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 347 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64" |
348 | StringPooling="true" | ||
347 | ExceptionHandling="0" | 349 | ExceptionHandling="0" |
348 | RuntimeLibrary="3" | 350 | RuntimeLibrary="2" |
349 | BufferSecurityCheck="false" | 351 | BufferSecurityCheck="false" |
352 | EnableFunctionLevelLinking="true" | ||
350 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 353 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
351 | AssemblerListingLocation="$(IntDir)\" | 354 | AssemblerListingLocation="$(IntDir)\" |
352 | ObjectFile="$(IntDir)\" | 355 | ObjectFile="$(IntDir)\" |
353 | ProgramDataBaseFileName="$(OutDir)\" | 356 | ProgramDataBaseFileName="$(OutDir)\" |
354 | WarningLevel="3" | 357 | WarningLevel="3" |
355 | SuppressStartupBanner="true" | 358 | SuppressStartupBanner="true" |
356 | Detect64BitPortabilityProblems="true" | ||
357 | DebugInformationFormat="1" | ||
358 | /> | 359 | /> |
359 | <Tool | 360 | <Tool |
360 | Name="VCManagedResourceCompilerTool" | 361 | Name="VCManagedResourceCompilerTool" |
@@ -368,7 +369,8 @@ | |||
368 | /> | 369 | /> |
369 | <Tool | 370 | <Tool |
370 | Name="VCLibrarianTool" | 371 | Name="VCLibrarianTool" |
371 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | 372 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" |
373 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
372 | OutputFile="$(OutDir)\zlibstat.lib" | 374 | OutputFile="$(OutDir)\zlibstat.lib" |
373 | SuppressStartupBanner="true" | 375 | SuppressStartupBanner="true" |
374 | /> | 376 | /> |
@@ -389,9 +391,9 @@ | |||
389 | /> | 391 | /> |
390 | </Configuration> | 392 | </Configuration> |
391 | <Configuration | 393 | <Configuration |
392 | Name="Release|x64" | 394 | Name="Release|Itanium" |
393 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | 395 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" |
394 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | 396 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" |
395 | ConfigurationType="4" | 397 | ConfigurationType="4" |
396 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 398 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
397 | UseOfMFC="0" | 399 | UseOfMFC="0" |
@@ -411,13 +413,13 @@ | |||
411 | /> | 413 | /> |
412 | <Tool | 414 | <Tool |
413 | Name="VCMIDLTool" | 415 | Name="VCMIDLTool" |
414 | TargetEnvironment="3" | 416 | TargetEnvironment="2" |
415 | /> | 417 | /> |
416 | <Tool | 418 | <Tool |
417 | Name="VCCLCompilerTool" | 419 | Name="VCCLCompilerTool" |
418 | InlineFunctionExpansion="1" | 420 | InlineFunctionExpansion="1" |
419 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 421 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
420 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64" | 422 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
421 | StringPooling="true" | 423 | StringPooling="true" |
422 | ExceptionHandling="0" | 424 | ExceptionHandling="0" |
423 | RuntimeLibrary="2" | 425 | RuntimeLibrary="2" |
@@ -442,8 +444,7 @@ | |||
442 | /> | 444 | /> |
443 | <Tool | 445 | <Tool |
444 | Name="VCLibrarianTool" | 446 | Name="VCLibrarianTool" |
445 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | 447 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" |
446 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
447 | OutputFile="$(OutDir)\zlibstat.lib" | 448 | OutputFile="$(OutDir)\zlibstat.lib" |
448 | SuppressStartupBanner="true" | 449 | SuppressStartupBanner="true" |
449 | /> | 450 | /> |
@@ -464,9 +465,9 @@ | |||
464 | /> | 465 | /> |
465 | </Configuration> | 466 | </Configuration> |
466 | <Configuration | 467 | <Configuration |
467 | Name="Release|Itanium" | 468 | Name="ReleaseWithoutAsm|Win32" |
468 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | 469 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" |
469 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | 470 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" |
470 | ConfigurationType="4" | 471 | ConfigurationType="4" |
471 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 472 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
472 | UseOfMFC="0" | 473 | UseOfMFC="0" |
@@ -486,16 +487,15 @@ | |||
486 | /> | 487 | /> |
487 | <Tool | 488 | <Tool |
488 | Name="VCMIDLTool" | 489 | Name="VCMIDLTool" |
489 | TargetEnvironment="2" | ||
490 | /> | 490 | /> |
491 | <Tool | 491 | <Tool |
492 | Name="VCCLCompilerTool" | 492 | Name="VCCLCompilerTool" |
493 | InlineFunctionExpansion="1" | 493 | InlineFunctionExpansion="1" |
494 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 494 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
495 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 495 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
496 | StringPooling="true" | 496 | StringPooling="true" |
497 | ExceptionHandling="0" | 497 | ExceptionHandling="0" |
498 | RuntimeLibrary="2" | 498 | RuntimeLibrary="0" |
499 | BufferSecurityCheck="false" | 499 | BufferSecurityCheck="false" |
500 | EnableFunctionLevelLinking="true" | 500 | EnableFunctionLevelLinking="true" |
501 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 501 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
@@ -517,7 +517,7 @@ | |||
517 | /> | 517 | /> |
518 | <Tool | 518 | <Tool |
519 | Name="VCLibrarianTool" | 519 | Name="VCLibrarianTool" |
520 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | 520 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" |
521 | OutputFile="$(OutDir)\zlibstat.lib" | 521 | OutputFile="$(OutDir)\zlibstat.lib" |
522 | SuppressStartupBanner="true" | 522 | SuppressStartupBanner="true" |
523 | /> | 523 | /> |
@@ -709,63 +709,11 @@ | |||
709 | > | 709 | > |
710 | </File> | 710 | </File> |
711 | <File | 711 | <File |
712 | RelativePath="..\..\masmx86\gvmat32c.c" | ||
713 | > | ||
714 | <FileConfiguration | ||
715 | Name="Debug|x64" | ||
716 | ExcludedFromBuild="true" | ||
717 | > | ||
718 | <Tool | ||
719 | Name="VCCLCompilerTool" | ||
720 | /> | ||
721 | </FileConfiguration> | ||
722 | <FileConfiguration | ||
723 | Name="Debug|Itanium" | ||
724 | ExcludedFromBuild="true" | ||
725 | > | ||
726 | <Tool | ||
727 | Name="VCCLCompilerTool" | ||
728 | /> | ||
729 | </FileConfiguration> | ||
730 | <FileConfiguration | ||
731 | Name="Release|x64" | ||
732 | ExcludedFromBuild="true" | ||
733 | > | ||
734 | <Tool | ||
735 | Name="VCCLCompilerTool" | ||
736 | /> | ||
737 | </FileConfiguration> | ||
738 | <FileConfiguration | ||
739 | Name="Release|Itanium" | ||
740 | ExcludedFromBuild="true" | ||
741 | > | ||
742 | <Tool | ||
743 | Name="VCCLCompilerTool" | ||
744 | /> | ||
745 | </FileConfiguration> | ||
746 | <FileConfiguration | ||
747 | Name="ReleaseWithoutAsm|x64" | ||
748 | ExcludedFromBuild="true" | ||
749 | > | ||
750 | <Tool | ||
751 | Name="VCCLCompilerTool" | ||
752 | /> | ||
753 | </FileConfiguration> | ||
754 | <FileConfiguration | ||
755 | Name="ReleaseWithoutAsm|Itanium" | ||
756 | ExcludedFromBuild="true" | ||
757 | > | ||
758 | <Tool | ||
759 | Name="VCCLCompilerTool" | ||
760 | /> | ||
761 | </FileConfiguration> | ||
762 | </File> | ||
763 | <File | ||
764 | RelativePath="..\..\..\gzclose.c" | 712 | RelativePath="..\..\..\gzclose.c" |
765 | > | 713 | > |
766 | </File> | 714 | </File> |
767 | <File | 715 | <File |
768 | RelativePath="..\..\..\gzio.c" | 716 | RelativePath="..\..\..\gzguts.h" |
769 | > | 717 | > |
770 | </File> | 718 | </File> |
771 | <File | 719 | <File |
@@ -796,7 +744,7 @@ | |||
796 | /> | 744 | /> |
797 | </FileConfiguration> | 745 | </FileConfiguration> |
798 | <FileConfiguration | 746 | <FileConfiguration |
799 | Name="Release|Win32" | 747 | Name="Debug|Itanium" |
800 | ExcludedFromBuild="true" | 748 | ExcludedFromBuild="true" |
801 | > | 749 | > |
802 | <Tool | 750 | <Tool |
@@ -804,7 +752,7 @@ | |||
804 | /> | 752 | /> |
805 | </FileConfiguration> | 753 | </FileConfiguration> |
806 | <FileConfiguration | 754 | <FileConfiguration |
807 | Name="ReleaseWithoutAsm|Win32" | 755 | Name="Release|Win32" |
808 | ExcludedFromBuild="true" | 756 | ExcludedFromBuild="true" |
809 | > | 757 | > |
810 | <Tool | 758 | <Tool |
@@ -812,7 +760,7 @@ | |||
812 | /> | 760 | /> |
813 | </FileConfiguration> | 761 | </FileConfiguration> |
814 | <FileConfiguration | 762 | <FileConfiguration |
815 | Name="Debug|Itanium" | 763 | Name="Release|Itanium" |
816 | ExcludedFromBuild="true" | 764 | ExcludedFromBuild="true" |
817 | > | 765 | > |
818 | <Tool | 766 | <Tool |
@@ -820,7 +768,7 @@ | |||
820 | /> | 768 | /> |
821 | </FileConfiguration> | 769 | </FileConfiguration> |
822 | <FileConfiguration | 770 | <FileConfiguration |
823 | Name="Release|Itanium" | 771 | Name="ReleaseWithoutAsm|Win32" |
824 | ExcludedFromBuild="true" | 772 | ExcludedFromBuild="true" |
825 | > | 773 | > |
826 | <Tool | 774 | <Tool |
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index 0b6a9e9..b3b7cab 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def | |||
@@ -1,7 +1,7 @@ | |||
1 | LIBRARY | ||
2 | ; zlib data compression and ZIP file I/O library | ||
1 | 3 | ||
2 | VERSION 1.23 | 4 | VERSION 1.24 |
3 | |||
4 | HEAPSIZE 1048576,8192 | ||
5 | 5 | ||
6 | EXPORTS | 6 | EXPORTS |
7 | adler32 @1 | 7 | adler32 @1 |
@@ -90,25 +90,47 @@ EXPORTS | |||
90 | unzGoToFilePos @101 | 90 | unzGoToFilePos @101 |
91 | 91 | ||
92 | fill_win32_filefunc @110 | 92 | fill_win32_filefunc @110 |
93 | fill_win32_filefunc64 @111 | ||
94 | fill_win32_filefunc64A @112 | ||
95 | fill_win32_filefunc64W @113 | ||
96 | 93 | ||
97 | ; quick hack by hkuno@microhouse.co.jp | 94 | ; zlibwapi v1.2.4 added: |
98 | unzOpen64 @120 | 95 | fill_win32_filefunc64 @111 |
99 | unzOpen2_64 @121 | 96 | fill_win32_filefunc64A @112 |
100 | unzGetGlobalInfo64 @122 | 97 | fill_win32_filefunc64W @113 |
101 | unzGetCurrentFileInfo64 @124 | 98 | |
102 | unzGetCurrentFileZStreamPos64 @125 | 99 | unzOpen64 @120 |
103 | unztell64 @126 | 100 | unzOpen2_64 @121 |
104 | unzGetFilePos64 @127 | 101 | unzGetGlobalInfo64 @122 |
105 | unzGoToFilePos64 @128 | 102 | unzGetCurrentFileInfo64 @124 |
103 | unzGetCurrentFileZStreamPos64 @125 | ||
104 | unztell64 @126 | ||
105 | unzGetFilePos64 @127 | ||
106 | unzGoToFilePos64 @128 | ||
107 | |||
108 | zipOpen64 @130 | ||
109 | zipOpen2_64 @131 | ||
110 | zipOpenNewFileInZip64 @132 | ||
111 | zipOpenNewFileInZip2_64 @133 | ||
112 | zipOpenNewFileInZip3_64 @134 | ||
113 | zipOpenNewFileInZip4_64 @135 | ||
114 | zipCloseFileInZipRaw64 @136 | ||
106 | 115 | ||
107 | zipOpen64 @130 | 116 | ; zlib1 v1.2.4 added: |
108 | zipOpen2_64 @131 | 117 | adler32_combine @140 |
109 | zipOpenNewFileInZip64 @132 | 118 | adler32_combine64 @141 |
110 | zipOpenNewFileInZip2_64 @133 | 119 | crc32_combine @142 |
111 | zipOpenNewFileInZip3_64 @134 | 120 | crc32_combine64 @143 |
112 | zipOpenNewFileInZip4_64 @135 | 121 | deflateSetHeader @144 |
113 | zipCloseFileInZipRaw64 @136 | 122 | deflateTune @145 |
114 | ; end hack | 123 | gzbuffer @146 |
124 | gzclose_r @147 | ||
125 | gzclose_w @148 | ||
126 | gzdirect @149 | ||
127 | gzoffset @150 | ||
128 | gzoffset64 @151 | ||
129 | gzopen64 @152 | ||
130 | gzseek64 @153 | ||
131 | gztell64 @154 | ||
132 | inflateGetHeader @156 | ||
133 | inflateMark @157 | ||
134 | inflatePrime @158 | ||
135 | inflateReset2 @159 | ||
136 | inflateUndermine @160 | ||
diff --git a/contrib/vstudio/vc9/zlibvc.sln b/contrib/vstudio/vc9/zlibvc.sln index c7f1b0b..b482967 100644 --- a/contrib/vstudio/vc9/zlibvc.sln +++ b/contrib/vstudio/vc9/zlibvc.sln | |||
@@ -45,8 +45,8 @@ Global | |||
45 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium | 45 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium |
46 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 | 46 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 |
47 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 | 47 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 |
48 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64 | 48 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64 |
49 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = ReleaseWithoutAsm|x64 | 49 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64 |
50 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium | 50 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium |
51 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium | 51 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium |
52 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | 52 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 |
@@ -103,8 +103,8 @@ Global | |||
103 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64 | 103 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64 |
104 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | 104 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium |
105 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | 105 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium |
106 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | 106 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 |
107 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | 107 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 |
108 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium | 108 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium |
109 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium | 109 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium |
110 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 | 110 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 |
@@ -119,8 +119,8 @@ Global | |||
119 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 | 119 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 |
120 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | 120 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium |
121 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | 121 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium |
122 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | 122 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 |
123 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | 123 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 |
124 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium | 124 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium |
125 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium | 125 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium |
126 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32 | 126 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32 |
@@ -135,8 +135,8 @@ Global | |||
135 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64 | 135 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64 |
136 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | 136 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium |
137 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | 137 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium |
138 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | 138 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 |
139 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | 139 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 |
140 | EndGlobalSection | 140 | EndGlobalSection |
141 | GlobalSection(SolutionProperties) = preSolution | 141 | GlobalSection(SolutionProperties) = preSolution |
142 | HideSolutionNode = FALSE | 142 | HideSolutionNode = FALSE |
diff --git a/contrib/vstudio/vc9/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj index ee86786..c9a8947 100644 --- a/contrib/vstudio/vc9/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="9.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 | RootNamespace="zlibvc" | ||
7 | TargetFrameworkVersion="131072" | 8 | TargetFrameworkVersion="131072" |
8 | > | 9 | > |
9 | <Platforms> | 10 | <Platforms> |
@@ -80,7 +81,7 @@ | |||
80 | <Tool | 81 | <Tool |
81 | Name="VCLinkerTool" | 82 | Name="VCLinkerTool" |
82 | AdditionalOptions="/MACHINE:I386" | 83 | AdditionalOptions="/MACHINE:I386" |
83 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | 84 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj" |
84 | OutputFile="$(OutDir)\zlibwapi.dll" | 85 | OutputFile="$(OutDir)\zlibwapi.dll" |
85 | LinkIncremental="2" | 86 | LinkIncremental="2" |
86 | SuppressStartupBanner="true" | 87 | SuppressStartupBanner="true" |
@@ -118,14 +119,13 @@ | |||
118 | /> | 119 | /> |
119 | </Configuration> | 120 | </Configuration> |
120 | <Configuration | 121 | <Configuration |
121 | Name="ReleaseWithoutAsm|Win32" | 122 | Name="Debug|x64" |
122 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | 123 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" |
123 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | 124 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" |
124 | ConfigurationType="2" | 125 | ConfigurationType="2" |
125 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 126 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
126 | UseOfMFC="0" | 127 | UseOfMFC="0" |
127 | ATLMinimizesCRunTimeLibraryUsage="false" | 128 | ATLMinimizesCRunTimeLibraryUsage="false" |
128 | WholeProgramOptimization="1" | ||
129 | > | 129 | > |
130 | <Tool | 130 | <Tool |
131 | Name="VCPreBuildEventTool" | 131 | Name="VCPreBuildEventTool" |
@@ -141,37 +141,35 @@ | |||
141 | /> | 141 | /> |
142 | <Tool | 142 | <Tool |
143 | Name="VCMIDLTool" | 143 | Name="VCMIDLTool" |
144 | PreprocessorDefinitions="NDEBUG" | 144 | PreprocessorDefinitions="_DEBUG" |
145 | MkTypLibCompatible="true" | 145 | MkTypLibCompatible="true" |
146 | SuppressStartupBanner="true" | 146 | SuppressStartupBanner="true" |
147 | TargetEnvironment="1" | 147 | TargetEnvironment="3" |
148 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 148 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
149 | /> | 149 | /> |
150 | <Tool | 150 | <Tool |
151 | Name="VCCLCompilerTool" | 151 | Name="VCCLCompilerTool" |
152 | InlineFunctionExpansion="1" | 152 | Optimization="0" |
153 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 153 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
154 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" | 154 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" |
155 | StringPooling="true" | ||
156 | ExceptionHandling="0" | 155 | ExceptionHandling="0" |
157 | RuntimeLibrary="2" | 156 | RuntimeLibrary="3" |
158 | BufferSecurityCheck="false" | 157 | BufferSecurityCheck="false" |
159 | EnableFunctionLevelLinking="true" | ||
160 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 158 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
161 | AssemblerOutput="2" | ||
162 | AssemblerListingLocation="$(IntDir)\" | 159 | AssemblerListingLocation="$(IntDir)\" |
163 | ObjectFile="$(IntDir)\" | 160 | ObjectFile="$(IntDir)\" |
164 | ProgramDataBaseFileName="$(OutDir)\" | 161 | ProgramDataBaseFileName="$(OutDir)\" |
165 | BrowseInformation="0" | 162 | BrowseInformation="0" |
166 | WarningLevel="3" | 163 | WarningLevel="3" |
167 | SuppressStartupBanner="true" | 164 | SuppressStartupBanner="true" |
165 | DebugInformationFormat="3" | ||
168 | /> | 166 | /> |
169 | <Tool | 167 | <Tool |
170 | Name="VCManagedResourceCompilerTool" | 168 | Name="VCManagedResourceCompilerTool" |
171 | /> | 169 | /> |
172 | <Tool | 170 | <Tool |
173 | Name="VCResourceCompilerTool" | 171 | Name="VCResourceCompilerTool" |
174 | PreprocessorDefinitions="NDEBUG" | 172 | PreprocessorDefinitions="_DEBUG" |
175 | Culture="1036" | 173 | Culture="1036" |
176 | /> | 174 | /> |
177 | <Tool | 175 | <Tool |
@@ -179,21 +177,19 @@ | |||
179 | /> | 177 | /> |
180 | <Tool | 178 | <Tool |
181 | Name="VCLinkerTool" | 179 | Name="VCLinkerTool" |
182 | AdditionalOptions="/MACHINE:I386" | 180 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " |
183 | OutputFile="$(OutDir)\zlibwapi.dll" | 181 | OutputFile="$(OutDir)\zlibwapi.dll" |
184 | LinkIncremental="1" | 182 | LinkIncremental="2" |
185 | SuppressStartupBanner="true" | 183 | SuppressStartupBanner="true" |
186 | GenerateManifest="false" | 184 | GenerateManifest="false" |
187 | IgnoreAllDefaultLibraries="false" | ||
188 | ModuleDefinitionFile=".\zlibvc.def" | 185 | ModuleDefinitionFile=".\zlibvc.def" |
186 | GenerateDebugInformation="true" | ||
189 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 187 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
190 | GenerateMapFile="true" | 188 | GenerateMapFile="true" |
191 | MapFileName="$(OutDir)/zlibwapi.map" | 189 | MapFileName="$(OutDir)/zlibwapi.map" |
192 | SubSystem="2" | 190 | SubSystem="2" |
193 | OptimizeForWindows98="1" | ||
194 | RandomizedBaseAddress="1" | ||
195 | DataExecutionPrevention="0" | ||
196 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 191 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
192 | TargetMachine="17" | ||
197 | /> | 193 | /> |
198 | <Tool | 194 | <Tool |
199 | Name="VCALinkTool" | 195 | Name="VCALinkTool" |
@@ -218,14 +214,13 @@ | |||
218 | /> | 214 | /> |
219 | </Configuration> | 215 | </Configuration> |
220 | <Configuration | 216 | <Configuration |
221 | Name="Release|Win32" | 217 | Name="Debug|Itanium" |
222 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | 218 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" |
223 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | 219 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" |
224 | ConfigurationType="2" | 220 | ConfigurationType="2" |
225 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 221 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
226 | UseOfMFC="0" | 222 | UseOfMFC="0" |
227 | ATLMinimizesCRunTimeLibraryUsage="false" | 223 | ATLMinimizesCRunTimeLibraryUsage="false" |
228 | WholeProgramOptimization="1" | ||
229 | > | 224 | > |
230 | <Tool | 225 | <Tool |
231 | Name="VCPreBuildEventTool" | 226 | Name="VCPreBuildEventTool" |
@@ -241,37 +236,35 @@ | |||
241 | /> | 236 | /> |
242 | <Tool | 237 | <Tool |
243 | Name="VCMIDLTool" | 238 | Name="VCMIDLTool" |
244 | PreprocessorDefinitions="NDEBUG" | 239 | PreprocessorDefinitions="_DEBUG" |
245 | MkTypLibCompatible="true" | 240 | MkTypLibCompatible="true" |
246 | SuppressStartupBanner="true" | 241 | SuppressStartupBanner="true" |
247 | TargetEnvironment="1" | 242 | TargetEnvironment="2" |
248 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 243 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
249 | /> | 244 | /> |
250 | <Tool | 245 | <Tool |
251 | Name="VCCLCompilerTool" | 246 | Name="VCCLCompilerTool" |
252 | InlineFunctionExpansion="1" | 247 | Optimization="0" |
253 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 248 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
254 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" | 249 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
255 | StringPooling="true" | ||
256 | ExceptionHandling="0" | 250 | ExceptionHandling="0" |
257 | RuntimeLibrary="2" | 251 | RuntimeLibrary="3" |
258 | BufferSecurityCheck="false" | 252 | BufferSecurityCheck="false" |
259 | EnableFunctionLevelLinking="true" | ||
260 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 253 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
261 | AssemblerOutput="2" | ||
262 | AssemblerListingLocation="$(IntDir)\" | 254 | AssemblerListingLocation="$(IntDir)\" |
263 | ObjectFile="$(IntDir)\" | 255 | ObjectFile="$(IntDir)\" |
264 | ProgramDataBaseFileName="$(OutDir)\" | 256 | ProgramDataBaseFileName="$(OutDir)\" |
265 | BrowseInformation="0" | 257 | BrowseInformation="0" |
266 | WarningLevel="3" | 258 | WarningLevel="3" |
267 | SuppressStartupBanner="true" | 259 | SuppressStartupBanner="true" |
260 | DebugInformationFormat="3" | ||
268 | /> | 261 | /> |
269 | <Tool | 262 | <Tool |
270 | Name="VCManagedResourceCompilerTool" | 263 | Name="VCManagedResourceCompilerTool" |
271 | /> | 264 | /> |
272 | <Tool | 265 | <Tool |
273 | Name="VCResourceCompilerTool" | 266 | Name="VCResourceCompilerTool" |
274 | PreprocessorDefinitions="NDEBUG" | 267 | PreprocessorDefinitions="_DEBUG" |
275 | Culture="1036" | 268 | Culture="1036" |
276 | /> | 269 | /> |
277 | <Tool | 270 | <Tool |
@@ -279,22 +272,18 @@ | |||
279 | /> | 272 | /> |
280 | <Tool | 273 | <Tool |
281 | Name="VCLinkerTool" | 274 | Name="VCLinkerTool" |
282 | AdditionalOptions="/MACHINE:I386" | ||
283 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
284 | OutputFile="$(OutDir)\zlibwapi.dll" | 275 | OutputFile="$(OutDir)\zlibwapi.dll" |
285 | LinkIncremental="1" | 276 | LinkIncremental="2" |
286 | SuppressStartupBanner="true" | 277 | SuppressStartupBanner="true" |
287 | GenerateManifest="false" | 278 | GenerateManifest="false" |
288 | IgnoreAllDefaultLibraries="false" | ||
289 | ModuleDefinitionFile=".\zlibvc.def" | 279 | ModuleDefinitionFile=".\zlibvc.def" |
280 | GenerateDebugInformation="true" | ||
290 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 281 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
291 | GenerateMapFile="true" | 282 | GenerateMapFile="true" |
292 | MapFileName="$(OutDir)/zlibwapi.map" | 283 | MapFileName="$(OutDir)/zlibwapi.map" |
293 | SubSystem="2" | 284 | SubSystem="2" |
294 | OptimizeForWindows98="1" | ||
295 | RandomizedBaseAddress="1" | ||
296 | DataExecutionPrevention="0" | ||
297 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 285 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
286 | TargetMachine="5" | ||
298 | /> | 287 | /> |
299 | <Tool | 288 | <Tool |
300 | Name="VCALinkTool" | 289 | Name="VCALinkTool" |
@@ -319,13 +308,14 @@ | |||
319 | /> | 308 | /> |
320 | </Configuration> | 309 | </Configuration> |
321 | <Configuration | 310 | <Configuration |
322 | Name="Debug|x64" | 311 | Name="ReleaseWithoutAsm|Win32" |
323 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | 312 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" |
324 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | 313 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" |
325 | ConfigurationType="2" | 314 | ConfigurationType="2" |
326 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 315 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
327 | UseOfMFC="0" | 316 | UseOfMFC="0" |
328 | ATLMinimizesCRunTimeLibraryUsage="false" | 317 | ATLMinimizesCRunTimeLibraryUsage="false" |
318 | WholeProgramOptimization="1" | ||
329 | > | 319 | > |
330 | <Tool | 320 | <Tool |
331 | Name="VCPreBuildEventTool" | 321 | Name="VCPreBuildEventTool" |
@@ -341,35 +331,37 @@ | |||
341 | /> | 331 | /> |
342 | <Tool | 332 | <Tool |
343 | Name="VCMIDLTool" | 333 | Name="VCMIDLTool" |
344 | PreprocessorDefinitions="_DEBUG" | 334 | PreprocessorDefinitions="NDEBUG" |
345 | MkTypLibCompatible="true" | 335 | MkTypLibCompatible="true" |
346 | SuppressStartupBanner="true" | 336 | SuppressStartupBanner="true" |
347 | TargetEnvironment="3" | 337 | TargetEnvironment="1" |
348 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 338 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
349 | /> | 339 | /> |
350 | <Tool | 340 | <Tool |
351 | Name="VCCLCompilerTool" | 341 | Name="VCCLCompilerTool" |
352 | Optimization="0" | 342 | InlineFunctionExpansion="1" |
353 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 343 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
354 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" | 344 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" |
345 | StringPooling="true" | ||
355 | ExceptionHandling="0" | 346 | ExceptionHandling="0" |
356 | RuntimeLibrary="3" | 347 | RuntimeLibrary="2" |
357 | BufferSecurityCheck="false" | 348 | BufferSecurityCheck="false" |
349 | EnableFunctionLevelLinking="true" | ||
358 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 350 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
351 | AssemblerOutput="2" | ||
359 | AssemblerListingLocation="$(IntDir)\" | 352 | AssemblerListingLocation="$(IntDir)\" |
360 | ObjectFile="$(IntDir)\" | 353 | ObjectFile="$(IntDir)\" |
361 | ProgramDataBaseFileName="$(OutDir)\" | 354 | ProgramDataBaseFileName="$(OutDir)\" |
362 | BrowseInformation="0" | 355 | BrowseInformation="0" |
363 | WarningLevel="3" | 356 | WarningLevel="3" |
364 | SuppressStartupBanner="true" | 357 | SuppressStartupBanner="true" |
365 | DebugInformationFormat="3" | ||
366 | /> | 358 | /> |
367 | <Tool | 359 | <Tool |
368 | Name="VCManagedResourceCompilerTool" | 360 | Name="VCManagedResourceCompilerTool" |
369 | /> | 361 | /> |
370 | <Tool | 362 | <Tool |
371 | Name="VCResourceCompilerTool" | 363 | Name="VCResourceCompilerTool" |
372 | PreprocessorDefinitions="_DEBUG" | 364 | PreprocessorDefinitions="NDEBUG" |
373 | Culture="1036" | 365 | Culture="1036" |
374 | /> | 366 | /> |
375 | <Tool | 367 | <Tool |
@@ -377,19 +369,21 @@ | |||
377 | /> | 369 | /> |
378 | <Tool | 370 | <Tool |
379 | Name="VCLinkerTool" | 371 | Name="VCLinkerTool" |
380 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | 372 | AdditionalOptions="/MACHINE:I386" |
381 | OutputFile="$(OutDir)\zlibwapi.dll" | 373 | OutputFile="$(OutDir)\zlibwapi.dll" |
382 | LinkIncremental="2" | 374 | LinkIncremental="1" |
383 | SuppressStartupBanner="true" | 375 | SuppressStartupBanner="true" |
384 | GenerateManifest="false" | 376 | GenerateManifest="false" |
377 | IgnoreAllDefaultLibraries="false" | ||
385 | ModuleDefinitionFile=".\zlibvc.def" | 378 | ModuleDefinitionFile=".\zlibvc.def" |
386 | GenerateDebugInformation="true" | ||
387 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 379 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
388 | GenerateMapFile="true" | 380 | GenerateMapFile="true" |
389 | MapFileName="$(OutDir)/zlibwapi.map" | 381 | MapFileName="$(OutDir)/zlibwapi.map" |
390 | SubSystem="2" | 382 | SubSystem="2" |
383 | OptimizeForWindows98="1" | ||
384 | RandomizedBaseAddress="1" | ||
385 | DataExecutionPrevention="0" | ||
391 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 386 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
392 | TargetMachine="17" | ||
393 | /> | 387 | /> |
394 | <Tool | 388 | <Tool |
395 | Name="VCALinkTool" | 389 | Name="VCALinkTool" |
@@ -410,20 +404,18 @@ | |||
410 | Name="VCAppVerifierTool" | 404 | Name="VCAppVerifierTool" |
411 | /> | 405 | /> |
412 | <Tool | 406 | <Tool |
413 | Name="VCWebDeploymentTool" | ||
414 | /> | ||
415 | <Tool | ||
416 | Name="VCPostBuildEventTool" | 407 | Name="VCPostBuildEventTool" |
417 | /> | 408 | /> |
418 | </Configuration> | 409 | </Configuration> |
419 | <Configuration | 410 | <Configuration |
420 | Name="Debug|Itanium" | 411 | Name="ReleaseWithoutAsm|x64" |
421 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | 412 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" |
422 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | 413 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" |
423 | ConfigurationType="2" | 414 | ConfigurationType="2" |
424 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 415 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
425 | UseOfMFC="0" | 416 | UseOfMFC="0" |
426 | ATLMinimizesCRunTimeLibraryUsage="false" | 417 | ATLMinimizesCRunTimeLibraryUsage="false" |
418 | WholeProgramOptimization="1" | ||
427 | > | 419 | > |
428 | <Tool | 420 | <Tool |
429 | Name="VCPreBuildEventTool" | 421 | Name="VCPreBuildEventTool" |
@@ -439,35 +431,37 @@ | |||
439 | /> | 431 | /> |
440 | <Tool | 432 | <Tool |
441 | Name="VCMIDLTool" | 433 | Name="VCMIDLTool" |
442 | PreprocessorDefinitions="_DEBUG" | 434 | PreprocessorDefinitions="NDEBUG" |
443 | MkTypLibCompatible="true" | 435 | MkTypLibCompatible="true" |
444 | SuppressStartupBanner="true" | 436 | SuppressStartupBanner="true" |
445 | TargetEnvironment="2" | 437 | TargetEnvironment="3" |
446 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 438 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
447 | /> | 439 | /> |
448 | <Tool | 440 | <Tool |
449 | Name="VCCLCompilerTool" | 441 | Name="VCCLCompilerTool" |
450 | Optimization="0" | 442 | InlineFunctionExpansion="1" |
451 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 443 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
452 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" | 444 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
445 | StringPooling="true" | ||
453 | ExceptionHandling="0" | 446 | ExceptionHandling="0" |
454 | RuntimeLibrary="3" | 447 | RuntimeLibrary="2" |
455 | BufferSecurityCheck="false" | 448 | BufferSecurityCheck="false" |
449 | EnableFunctionLevelLinking="true" | ||
456 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 450 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
451 | AssemblerOutput="2" | ||
457 | AssemblerListingLocation="$(IntDir)\" | 452 | AssemblerListingLocation="$(IntDir)\" |
458 | ObjectFile="$(IntDir)\" | 453 | ObjectFile="$(IntDir)\" |
459 | ProgramDataBaseFileName="$(OutDir)\" | 454 | ProgramDataBaseFileName="$(OutDir)\" |
460 | BrowseInformation="0" | 455 | BrowseInformation="0" |
461 | WarningLevel="3" | 456 | WarningLevel="3" |
462 | SuppressStartupBanner="true" | 457 | SuppressStartupBanner="true" |
463 | DebugInformationFormat="3" | ||
464 | /> | 458 | /> |
465 | <Tool | 459 | <Tool |
466 | Name="VCManagedResourceCompilerTool" | 460 | Name="VCManagedResourceCompilerTool" |
467 | /> | 461 | /> |
468 | <Tool | 462 | <Tool |
469 | Name="VCResourceCompilerTool" | 463 | Name="VCResourceCompilerTool" |
470 | PreprocessorDefinitions="_DEBUG" | 464 | PreprocessorDefinitions="NDEBUG" |
471 | Culture="1036" | 465 | Culture="1036" |
472 | /> | 466 | /> |
473 | <Tool | 467 | <Tool |
@@ -476,17 +470,18 @@ | |||
476 | <Tool | 470 | <Tool |
477 | Name="VCLinkerTool" | 471 | Name="VCLinkerTool" |
478 | OutputFile="$(OutDir)\zlibwapi.dll" | 472 | OutputFile="$(OutDir)\zlibwapi.dll" |
479 | LinkIncremental="2" | 473 | LinkIncremental="1" |
480 | SuppressStartupBanner="true" | 474 | SuppressStartupBanner="true" |
481 | GenerateManifest="false" | 475 | GenerateManifest="false" |
476 | IgnoreAllDefaultLibraries="false" | ||
482 | ModuleDefinitionFile=".\zlibvc.def" | 477 | ModuleDefinitionFile=".\zlibvc.def" |
483 | GenerateDebugInformation="true" | ||
484 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 478 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
485 | GenerateMapFile="true" | 479 | GenerateMapFile="true" |
486 | MapFileName="$(OutDir)/zlibwapi.map" | 480 | MapFileName="$(OutDir)/zlibwapi.map" |
487 | SubSystem="2" | 481 | SubSystem="2" |
482 | OptimizeForWindows98="1" | ||
488 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 483 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
489 | TargetMachine="5" | 484 | TargetMachine="17" |
490 | /> | 485 | /> |
491 | <Tool | 486 | <Tool |
492 | Name="VCALinkTool" | 487 | Name="VCALinkTool" |
@@ -507,16 +502,13 @@ | |||
507 | Name="VCAppVerifierTool" | 502 | Name="VCAppVerifierTool" |
508 | /> | 503 | /> |
509 | <Tool | 504 | <Tool |
510 | Name="VCWebDeploymentTool" | ||
511 | /> | ||
512 | <Tool | ||
513 | Name="VCPostBuildEventTool" | 505 | Name="VCPostBuildEventTool" |
514 | /> | 506 | /> |
515 | </Configuration> | 507 | </Configuration> |
516 | <Configuration | 508 | <Configuration |
517 | Name="ReleaseWithoutAsm|x64" | 509 | Name="ReleaseWithoutAsm|Itanium" |
518 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | 510 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" |
519 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | 511 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" |
520 | ConfigurationType="2" | 512 | ConfigurationType="2" |
521 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 513 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
522 | UseOfMFC="0" | 514 | UseOfMFC="0" |
@@ -540,7 +532,7 @@ | |||
540 | PreprocessorDefinitions="NDEBUG" | 532 | PreprocessorDefinitions="NDEBUG" |
541 | MkTypLibCompatible="true" | 533 | MkTypLibCompatible="true" |
542 | SuppressStartupBanner="true" | 534 | SuppressStartupBanner="true" |
543 | TargetEnvironment="3" | 535 | TargetEnvironment="2" |
544 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 536 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
545 | /> | 537 | /> |
546 | <Tool | 538 | <Tool |
@@ -587,7 +579,7 @@ | |||
587 | SubSystem="2" | 579 | SubSystem="2" |
588 | OptimizeForWindows98="1" | 580 | OptimizeForWindows98="1" |
589 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 581 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
590 | TargetMachine="17" | 582 | TargetMachine="5" |
591 | /> | 583 | /> |
592 | <Tool | 584 | <Tool |
593 | Name="VCALinkTool" | 585 | Name="VCALinkTool" |
@@ -608,16 +600,13 @@ | |||
608 | Name="VCAppVerifierTool" | 600 | Name="VCAppVerifierTool" |
609 | /> | 601 | /> |
610 | <Tool | 602 | <Tool |
611 | Name="VCWebDeploymentTool" | ||
612 | /> | ||
613 | <Tool | ||
614 | Name="VCPostBuildEventTool" | 603 | Name="VCPostBuildEventTool" |
615 | /> | 604 | /> |
616 | </Configuration> | 605 | </Configuration> |
617 | <Configuration | 606 | <Configuration |
618 | Name="ReleaseWithoutAsm|Itanium" | 607 | Name="Release|Win32" |
619 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | 608 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" |
620 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | 609 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" |
621 | ConfigurationType="2" | 610 | ConfigurationType="2" |
622 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 611 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
623 | UseOfMFC="0" | 612 | UseOfMFC="0" |
@@ -641,17 +630,17 @@ | |||
641 | PreprocessorDefinitions="NDEBUG" | 630 | PreprocessorDefinitions="NDEBUG" |
642 | MkTypLibCompatible="true" | 631 | MkTypLibCompatible="true" |
643 | SuppressStartupBanner="true" | 632 | SuppressStartupBanner="true" |
644 | TargetEnvironment="2" | 633 | TargetEnvironment="1" |
645 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 634 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
646 | /> | 635 | /> |
647 | <Tool | 636 | <Tool |
648 | Name="VCCLCompilerTool" | 637 | Name="VCCLCompilerTool" |
649 | InlineFunctionExpansion="1" | 638 | InlineFunctionExpansion="1" |
650 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 639 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
651 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" | 640 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" |
652 | StringPooling="true" | 641 | StringPooling="true" |
653 | ExceptionHandling="0" | 642 | ExceptionHandling="0" |
654 | RuntimeLibrary="2" | 643 | RuntimeLibrary="0" |
655 | BufferSecurityCheck="false" | 644 | BufferSecurityCheck="false" |
656 | EnableFunctionLevelLinking="true" | 645 | EnableFunctionLevelLinking="true" |
657 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 646 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
@@ -676,6 +665,8 @@ | |||
676 | /> | 665 | /> |
677 | <Tool | 666 | <Tool |
678 | Name="VCLinkerTool" | 667 | Name="VCLinkerTool" |
668 | AdditionalOptions="/MACHINE:I386" | ||
669 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj " | ||
679 | OutputFile="$(OutDir)\zlibwapi.dll" | 670 | OutputFile="$(OutDir)\zlibwapi.dll" |
680 | LinkIncremental="1" | 671 | LinkIncremental="1" |
681 | SuppressStartupBanner="true" | 672 | SuppressStartupBanner="true" |
@@ -687,8 +678,9 @@ | |||
687 | MapFileName="$(OutDir)/zlibwapi.map" | 678 | MapFileName="$(OutDir)/zlibwapi.map" |
688 | SubSystem="2" | 679 | SubSystem="2" |
689 | OptimizeForWindows98="1" | 680 | OptimizeForWindows98="1" |
681 | RandomizedBaseAddress="1" | ||
682 | DataExecutionPrevention="0" | ||
690 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 683 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
691 | TargetMachine="5" | ||
692 | /> | 684 | /> |
693 | <Tool | 685 | <Tool |
694 | Name="VCALinkTool" | 686 | Name="VCALinkTool" |
@@ -709,9 +701,6 @@ | |||
709 | Name="VCAppVerifierTool" | 701 | Name="VCAppVerifierTool" |
710 | /> | 702 | /> |
711 | <Tool | 703 | <Tool |
712 | Name="VCWebDeploymentTool" | ||
713 | /> | ||
714 | <Tool | ||
715 | Name="VCPostBuildEventTool" | 704 | Name="VCPostBuildEventTool" |
716 | /> | 705 | /> |
717 | </Configuration> | 706 | </Configuration> |
@@ -811,9 +800,6 @@ | |||
811 | Name="VCAppVerifierTool" | 800 | Name="VCAppVerifierTool" |
812 | /> | 801 | /> |
813 | <Tool | 802 | <Tool |
814 | Name="VCWebDeploymentTool" | ||
815 | /> | ||
816 | <Tool | ||
817 | Name="VCPostBuildEventTool" | 803 | Name="VCPostBuildEventTool" |
818 | /> | 804 | /> |
819 | </Configuration> | 805 | </Configuration> |
@@ -912,9 +898,6 @@ | |||
912 | Name="VCAppVerifierTool" | 898 | Name="VCAppVerifierTool" |
913 | /> | 899 | /> |
914 | <Tool | 900 | <Tool |
915 | Name="VCWebDeploymentTool" | ||
916 | /> | ||
917 | <Tool | ||
918 | Name="VCPostBuildEventTool" | 901 | Name="VCPostBuildEventTool" |
919 | /> | 902 | /> |
920 | </Configuration> | 903 | </Configuration> |
@@ -943,71 +926,11 @@ | |||
943 | > | 926 | > |
944 | </File> | 927 | </File> |
945 | <File | 928 | <File |
946 | RelativePath="..\..\masmx86\gvmat32c.c" | ||
947 | > | ||
948 | <FileConfiguration | ||
949 | Name="ReleaseWithoutAsm|Win32" | ||
950 | ExcludedFromBuild="true" | ||
951 | > | ||
952 | <Tool | ||
953 | Name="VCCLCompilerTool" | ||
954 | /> | ||
955 | </FileConfiguration> | ||
956 | <FileConfiguration | ||
957 | Name="Debug|x64" | ||
958 | ExcludedFromBuild="true" | ||
959 | > | ||
960 | <Tool | ||
961 | Name="VCCLCompilerTool" | ||
962 | /> | ||
963 | </FileConfiguration> | ||
964 | <FileConfiguration | ||
965 | Name="Debug|Itanium" | ||
966 | ExcludedFromBuild="true" | ||
967 | > | ||
968 | <Tool | ||
969 | Name="VCCLCompilerTool" | ||
970 | /> | ||
971 | </FileConfiguration> | ||
972 | <FileConfiguration | ||
973 | Name="ReleaseWithoutAsm|x64" | ||
974 | ExcludedFromBuild="true" | ||
975 | > | ||
976 | <Tool | ||
977 | Name="VCCLCompilerTool" | ||
978 | /> | ||
979 | </FileConfiguration> | ||
980 | <FileConfiguration | ||
981 | Name="ReleaseWithoutAsm|Itanium" | ||
982 | ExcludedFromBuild="true" | ||
983 | > | ||
984 | <Tool | ||
985 | Name="VCCLCompilerTool" | ||
986 | /> | ||
987 | </FileConfiguration> | ||
988 | <FileConfiguration | ||
989 | Name="Release|x64" | ||
990 | ExcludedFromBuild="true" | ||
991 | > | ||
992 | <Tool | ||
993 | Name="VCCLCompilerTool" | ||
994 | /> | ||
995 | </FileConfiguration> | ||
996 | <FileConfiguration | ||
997 | Name="Release|Itanium" | ||
998 | ExcludedFromBuild="true" | ||
999 | > | ||
1000 | <Tool | ||
1001 | Name="VCCLCompilerTool" | ||
1002 | /> | ||
1003 | </FileConfiguration> | ||
1004 | </File> | ||
1005 | <File | ||
1006 | RelativePath="..\..\..\gzclose.c" | 929 | RelativePath="..\..\..\gzclose.c" |
1007 | > | 930 | > |
1008 | </File> | 931 | </File> |
1009 | <File | 932 | <File |
1010 | RelativePath="..\..\..\gzio.c" | 933 | RelativePath="..\..\..\gzguts.h" |
1011 | > | 934 | > |
1012 | </File> | 935 | </File> |
1013 | <File | 936 | <File |
@@ -1038,7 +961,7 @@ | |||
1038 | /> | 961 | /> |
1039 | </FileConfiguration> | 962 | </FileConfiguration> |
1040 | <FileConfiguration | 963 | <FileConfiguration |
1041 | Name="ReleaseWithoutAsm|Win32" | 964 | Name="Debug|Itanium" |
1042 | ExcludedFromBuild="true" | 965 | ExcludedFromBuild="true" |
1043 | > | 966 | > |
1044 | <Tool | 967 | <Tool |
@@ -1046,7 +969,7 @@ | |||
1046 | /> | 969 | /> |
1047 | </FileConfiguration> | 970 | </FileConfiguration> |
1048 | <FileConfiguration | 971 | <FileConfiguration |
1049 | Name="Release|Win32" | 972 | Name="ReleaseWithoutAsm|Win32" |
1050 | ExcludedFromBuild="true" | 973 | ExcludedFromBuild="true" |
1051 | > | 974 | > |
1052 | <Tool | 975 | <Tool |
@@ -1054,7 +977,7 @@ | |||
1054 | /> | 977 | /> |
1055 | </FileConfiguration> | 978 | </FileConfiguration> |
1056 | <FileConfiguration | 979 | <FileConfiguration |
1057 | Name="Debug|Itanium" | 980 | Name="ReleaseWithoutAsm|Itanium" |
1058 | ExcludedFromBuild="true" | 981 | ExcludedFromBuild="true" |
1059 | > | 982 | > |
1060 | <Tool | 983 | <Tool |
@@ -1062,7 +985,7 @@ | |||
1062 | /> | 985 | /> |
1063 | </FileConfiguration> | 986 | </FileConfiguration> |
1064 | <FileConfiguration | 987 | <FileConfiguration |
1065 | Name="ReleaseWithoutAsm|Itanium" | 988 | Name="Release|Win32" |
1066 | ExcludedFromBuild="true" | 989 | ExcludedFromBuild="true" |
1067 | > | 990 | > |
1068 | <Tool | 991 | <Tool |