Fix contrib/vstudio project link errors [Mohanathas].

7 files changed, 44 insertions, 20 deletions

diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 904888b..59c8b8b 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,8 +1,8 @@
-Building instructions for the DLL versions of Zlib 1.2.4

+Building instructions for the DLL versions of Zlib 1.2.7

 ========================================================

 

 This directory contains projects that build zlib and minizip using

-Microsoft Visual C++ 9.0/10.0, and Visual C++ .

+Microsoft Visual C++ 9.0/10.0.

 

 You don't need to build these projects yourself. You can download the

 binaries from:

@@ -10,9 +10,6 @@ binaries from:
 

 More information can be found at this site.

 

-first compile assembly code by running

-bld_ml64.bat in contrib\masmx64

-bld_ml32.bat in contrib\masmx86

 

 

 

@@ -20,13 +17,16 @@ bld_ml32.bat in contrib\masmx86
 Build instructions for Visual Studio 2008 (32 bits or 64 bits)

 --------------------------------------------------------------

 - Uncompress current zlib, including all contrib/* files

-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0

+- Compile assembly code (with Visual Studio Command Prompt) by running:

+   bld_ml64.bat (in contrib\masmx64)

+   bld_ml32.bat (in contrib\masmx86)

+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008

 - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"

 

 Build instructions for Visual Studio 2010 (32 bits or 64 bits)

 --------------------------------------------------------------

 - Uncompress current zlib, including all contrib/* files

-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0

+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010

 

 

 Important

diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj b/contrib/vstudio/vc10/testzlibdll.vcxproj
index 2d62815..bcb08ff 100644
--- a/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ b/contrib/vstudio/vc10/testzlibdll.vcxproj
@@ -139,7 +139,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

       <SubSystem>Console</SubSystem>

@@ -169,7 +169,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

@@ -200,7 +200,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

       <SubSystem>Console</SubSystem>

@@ -227,7 +227,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

       <SubSystem>Console</SubSystem>

@@ -257,7 +257,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

@@ -288,7 +288,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 9c71a6a..8eca4db 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1.2.7,1

-  PRODUCTVERSION 1.2.7,1

+  FILEVERSION    1.2.7,0

+  PRODUCTVERSION 1.2.7,0

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index b4bb8f6..d39a1d2 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY

 ; zlib data compression and ZIP file I/O library

 

-VERSION         1.24

+VERSION         1.2.7

 

 EXPORTS

         adler32                                  @1

@@ -132,5 +132,6 @@ EXPORTS
 

 ; zlib1 v1.2.6 added:

         gzgetc_                                 @161

+        gzflags                                 @162

         inflateResetKeep                        @163

-        deflateResetKeep                        @164
+        deflateResetKeep                        @164

diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 9862398..9218fdc 100644
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -180,6 +180,12 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <Midl>

@@ -227,6 +233,10 @@
       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\masmx86

+bld_ml32.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

     <Midl>

@@ -324,6 +334,10 @@
       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\masmx86

+bld_ml32.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Midl>

@@ -368,6 +382,10 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\contrib\masmx64

+bld_ml64.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

     <Midl>

@@ -547,6 +565,10 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\masmx64

+bld_ml64.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

     <Midl>

diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 9c71a6a..8eca4db 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1.2.7,1

-  PRODUCTVERSION 1.2.7,1

+  FILEVERSION    1.2.7,0

+  PRODUCTVERSION 1.2.7,0

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index b4bb8f6..0c6d774 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY

 ; zlib data compression and ZIP file I/O library

 

-VERSION         1.24

+VERSION         1.2.7

 

 EXPORTS

         adler32                                  @1

@@ -132,5 +132,6 @@ EXPORTS
 

 ; zlib1 v1.2.6 added:

         gzgetc_                                 @161

+        gzflags                                 @162

         inflateResetKeep                        @163

         deflateResetKeep                        @164