From e3ba2a10cacd2e7786cecfa12466df544747ff7c Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 4 Mar 2012 09:46:25 -0800 Subject: [PATCH] Fix contrib/vstudio project link errors [Mohanathas]. --- contrib/vstudio/readme.txt | 14 +++++++------- contrib/vstudio/vc10/testzlibdll.vcxproj | 12 ++++++------ contrib/vstudio/vc10/zlib.rc | 4 ++-- contrib/vstudio/vc10/zlibvc.def | 5 +++-- contrib/vstudio/vc10/zlibvc.vcxproj | 22 ++++++++++++++++++++++ contrib/vstudio/vc9/zlib.rc | 4 ++-- contrib/vstudio/vc9/zlibvc.def | 3 ++- 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 @@ x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies) - $(OutDir)testzlib.exe + $(OutDir)testzlibdll.exe true $(OutDir)testzlib.pdb Console @@ -169,7 +169,7 @@ x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies) - $(OutDir)testzlib.exe + $(OutDir)testzlibdll.exe true Console true @@ -200,7 +200,7 @@ x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies) - $(OutDir)testzlib.exe + $(OutDir)testzlibdll.exe true $(OutDir)testzlib.pdb Console @@ -227,7 +227,7 @@ ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies) - $(OutDir)testzlib.exe + $(OutDir)testzlibdll.exe true $(OutDir)testzlib.pdb Console @@ -257,7 +257,7 @@ x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies) - $(OutDir)testzlib.exe + $(OutDir)testzlibdll.exe true Console true @@ -288,7 +288,7 @@ ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies) - $(OutDir)testzlib.exe + $(OutDir)testzlibdll.exe true Console true 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 @@ AllRules.ruleset + zlibwapi + zlibwapi + zlibwapi + zlibwapi + zlibwapi + zlibwapi @@ -227,6 +233,10 @@ $(OutDir)zlibwapi.lib + + cd ..\..\masmx86 +bld_ml32.bat + @@ -324,6 +334,10 @@ $(OutDir)zlibwapi.lib + + cd ..\..\masmx86 +bld_ml32.bat + @@ -368,6 +382,10 @@ $(OutDir)zlibwapi.lib MachineX64 + + cd ..\..\contrib\masmx64 +bld_ml64.bat + @@ -547,6 +565,10 @@ $(OutDir)zlibwapi.lib MachineX64 + + cd ..\..\masmx64 +bld_ml64.bat + 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 -- 2.7.4