Merge branch 'master' into gfortran-testdevel/gfortran-test

8 files changed, 42 insertions, 203 deletions

diff --git a/zlib/contrib/vstudio/vc9/miniunz.vcproj b/zlib/contrib/vstudio/vc9/miniunz.vcproj
index 7da32b9..cc3d13a 100644
--- a/zlib/contrib/vstudio/vc9/miniunz.vcproj
+++ b/zlib/contrib/vstudio/vc9/miniunz.vcproj
@@ -542,7 +542,7 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"

 			>

 			<File

 				RelativePath="..\..\minizip\miniunz.c"

diff --git a/zlib/contrib/vstudio/vc9/minizip.vcproj b/zlib/contrib/vstudio/vc9/minizip.vcproj
index e57e07d..fecd9dd 100644
--- a/zlib/contrib/vstudio/vc9/minizip.vcproj
+++ b/zlib/contrib/vstudio/vc9/minizip.vcproj
@@ -539,7 +539,7 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"

 			>

 			<File

 				RelativePath="..\..\minizip\minizip.c"

diff --git a/zlib/contrib/vstudio/vc9/testzlib.vcproj b/zlib/contrib/vstudio/vc9/testzlib.vcproj
index 9cb0bf8..ff69640 100644
--- a/zlib/contrib/vstudio/vc9/testzlib.vcproj
+++ b/zlib/contrib/vstudio/vc9/testzlib.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="0"

 				RuntimeLibrary="1"

@@ -71,7 +71,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"

 				OutputFile="$(OutDir)/testzlib.exe"

 				LinkIncremental="2"

 				GenerateManifest="false"

@@ -128,7 +127,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				BasicRuntimeChecks="0"

 				RuntimeLibrary="3"

 				BufferSecurityCheck="false"

@@ -145,7 +144,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"

 				GenerateManifest="false"

 			/>

 			<Tool

@@ -517,7 +515,7 @@
 				InlineFunctionExpansion="1"

 				OmitFramePointers="true"

 				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				StringPooling="true"

 				BasicRuntimeChecks="0"

 				RuntimeLibrary="0"

@@ -540,7 +538,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"

 				OutputFile="$(OutDir)/testzlib.exe"

 				LinkIncremental="1"

 				GenerateManifest="false"

@@ -600,7 +597,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				BasicRuntimeChecks="0"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

@@ -617,7 +614,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"

 				GenerateManifest="false"

 			/>

 			<Tool

@@ -733,7 +729,7 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"

 			>

 			<File

 				RelativePath="..\..\..\adler32.c"

@@ -756,58 +752,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\masmx64\inffas8664.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\..\..\inffast.c"

 				>

 			</File>

diff --git a/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
index b1ddde0..6448b49 100644
--- a/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
+++ b/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -542,7 +542,7 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"

 			>

 			<File

 				RelativePath="..\..\testzlib\testzlib.c"

diff --git a/zlib/contrib/vstudio/vc9/zlib.rc b/zlib/contrib/vstudio/vc9/zlib.rc
index fee177a..856bd11 100644
--- a/zlib/contrib/vstudio/vc9/zlib.rc
+++ b/zlib/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION	 1, 2, 11, 0

-  PRODUCTVERSION 1, 2, 11, 0

+  FILEVERSION	 1, 3, 1, 0

+  PRODUCTVERSION 1, 3, 1, 0

   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK

   FILEFLAGS	0

   FILEOS	VOS_DOS_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",	"1.2.11\0"

+      VALUE "FileVersion",	"1.3.1\0"

       VALUE "InternalName",	"zlib\0"

       VALUE "OriginalFilename",	"zlibwapi.dll\0"

       VALUE "ProductName",	"ZLib.DLL\0"

       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"

+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"

     END

   END

   BLOCK "VarFileInfo"

diff --git a/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/zlib/contrib/vstudio/vc9/zlibstat.vcproj
index 61c76c7..1bf1563 100644
--- a/zlib/contrib/vstudio/vc9/zlibstat.vcproj
+++ b/zlib/contrib/vstudio/vc9/zlibstat.vcproj
@@ -47,7 +47,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				ExceptionHandling="0"

 				RuntimeLibrary="1"

@@ -121,7 +121,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

@@ -195,7 +195,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

@@ -268,8 +268,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"

+				AdditionalIncludeDirectories="..\..\.."

+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="0"

@@ -295,7 +295,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "

 				OutputFile="$(OutDir)\zlibstat.lib"

 				SuppressStartupBanner="true"

 			/>

@@ -343,8 +342,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"

+				AdditionalIncludeDirectories="..\..\.."

+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -370,7 +369,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

 				OutputFile="$(OutDir)\zlibstat.lib"

 				SuppressStartupBanner="true"

 			/>

@@ -418,7 +416,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -491,7 +489,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -565,7 +563,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -639,7 +637,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -733,58 +731,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\masmx64\inffas8664.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\..\..\inffast.c"

 				>

 			</File>

diff --git a/zlib/contrib/vstudio/vc9/zlibvc.def b/zlib/contrib/vstudio/vc9/zlibvc.def
index 54e683d..3234a02 100644
--- a/zlib/contrib/vstudio/vc9/zlibvc.def
+++ b/zlib/contrib/vstudio/vc9/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY

 ; zlib data compression and ZIP file I/O library

 

-VERSION		1.2

+VERSION		1.3.1

 

 EXPORTS

         adler32                                  @1

@@ -151,3 +151,8 @@ EXPORTS
         deflateGetDictionary                    @173

         adler32_z                               @174

         crc32_z                                 @175

+

+; zlib1 v1.2.12 added:

+		crc32_combine_gen						@176

+		crc32_combine_gen64						@177

+		crc32_combine_op						@178

diff --git a/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/zlib/contrib/vstudio/vc9/zlibvc.vcproj
index c9a8947..f11dd1f 100644
--- a/zlib/contrib/vstudio/vc9/zlibvc.vcproj
+++ b/zlib/contrib/vstudio/vc9/zlibvc.vcproj
@@ -53,8 +53,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"

+				AdditionalIncludeDirectories="..\..\.."

+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="1"

 				BufferSecurityCheck="false"

@@ -81,7 +81,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"

 				OutputFile="$(OutDir)\zlibwapi.dll"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

@@ -150,8 +149,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

+				AdditionalIncludeDirectories="..\..\.."

+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				BufferSecurityCheck="false"

@@ -177,7 +176,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

 				OutputFile="$(OutDir)\zlibwapi.dll"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

@@ -245,7 +243,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

@@ -340,7 +338,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -440,7 +438,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -538,7 +536,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -636,8 +634,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"

+				AdditionalIncludeDirectories="..\..\.."

+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="0"

@@ -666,7 +664,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "

 				OutputFile="$(OutDir)\zlibwapi.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -737,8 +734,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

+				AdditionalIncludeDirectories="..\..\.."

+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -766,7 +763,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

 				OutputFile="$(OutDir)\zlibwapi.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -836,7 +832,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

+				AdditionalIncludeDirectories="..\..\.."

 				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -950,58 +946,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\masmx64\inffas8664.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\..\..\inffast.c"

 				>

 			</File>