From d71b3a779f78a1eb72cf359a4abf6cc968a8eff7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 18 Mar 2011 10:11:22 +0000 Subject: Import from zlib-1.2.4 --- cpukit/zlib/contrib/vstudio/readme.txt | 39 +++++++++++--------------------- cpukit/zlib/contrib/vstudio/vc10/zlib.rc | 32 ++++++++++++++++++++++++++ cpukit/zlib/contrib/vstudio/vc9/zlib.rc | 32 ++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 26 deletions(-) create mode 100644 cpukit/zlib/contrib/vstudio/vc10/zlib.rc create mode 100644 cpukit/zlib/contrib/vstudio/vc9/zlib.rc (limited to 'cpukit/zlib') diff --git a/cpukit/zlib/contrib/vstudio/readme.txt b/cpukit/zlib/contrib/vstudio/readme.txt index 16159f9cd0..904888ba39 100644 --- a/cpukit/zlib/contrib/vstudio/readme.txt +++ b/cpukit/zlib/contrib/vstudio/readme.txt @@ -1,8 +1,8 @@ -Building instructions for the DLL versions of Zlib 1.2.3 +Building instructions for the DLL versions of Zlib 1.2.4 ======================================================== This directory contains projects that build zlib and minizip using -Microsoft Visual C++ 7.0/7.1, and Visual C++ . +Microsoft Visual C++ 9.0/10.0, and Visual C++ . You don't need to build these projects yourself. You can download the binaries from: @@ -10,36 +10,23 @@ 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 + -Build instructions for Visual Studio 7.x (32 bits) --------------------------------------------------- -- Uncompress current zlib, including all contrib/* files -- Download the crtdll library from - http://www.winimage.com/zLibDll/crtdll.zip - Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc7. -- Open contrib\vstudio\vc7\zlibvc.sln with Microsoft Visual C++ 7.x - (Visual Studio .Net 2002 or 2003). -Build instructions for Visual Studio 2005 (32 bits or 64 bits) + +Build instructions for Visual Studio 2008 (32 bits or 64 bits) -------------------------------------------------------------- - Uncompress current zlib, including all contrib/* files -- For 32 bits only: download the crtdll library from - http://www.winimage.com/zLibDll/crtdll.zip - Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8. -- Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0 - -Build instructions for Visual Studio 2005 64 bits, PSDK compiler ----------------------------------------------------------------- -at the time of writing this text file, Visual Studio 2005 (and - Microsoft Visual C++ 8.0) is on the beta 2 stage. -Using you can get the free 64 bits compiler from Platform SDK, - which is NOT a beta, and compile using the Visual studio 2005 IDE -see http://www.winimage.com/misc/sdk64onvs2005/ for instruction +- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0 +- 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 -- start Visual Studio 2005 from a platform SDK command prompt, using - the /useenv switch -- Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0 +- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0 Important diff --git a/cpukit/zlib/contrib/vstudio/vc10/zlib.rc b/cpukit/zlib/contrib/vstudio/vc10/zlib.rc new file mode 100644 index 0000000000..23802d86a2 --- /dev/null +++ b/cpukit/zlib/contrib/vstudio/vc10/zlib.rc @@ -0,0 +1,32 @@ +#include + +#define IDR_VERSION1 1 +IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE + FILEVERSION 1,2,4,0 + PRODUCTVERSION 1,2,4,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS 0 + FILEOS VOS_DOS_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0 // not used +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + //language ID = U.S. English, char set = Windows, Multilingual + + BEGIN + VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" + VALUE "FileVersion", "1.2.4.0\0" + VALUE "InternalName", "zlib\0" + VALUE "OriginalFilename", "zlib.dll\0" + VALUE "ProductName", "ZLib.DLL\0" + VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" + VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END +END diff --git a/cpukit/zlib/contrib/vstudio/vc9/zlib.rc b/cpukit/zlib/contrib/vstudio/vc9/zlib.rc new file mode 100644 index 0000000000..23802d86a2 --- /dev/null +++ b/cpukit/zlib/contrib/vstudio/vc9/zlib.rc @@ -0,0 +1,32 @@ +#include + +#define IDR_VERSION1 1 +IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE + FILEVERSION 1,2,4,0 + PRODUCTVERSION 1,2,4,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS 0 + FILEOS VOS_DOS_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0 // not used +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + //language ID = U.S. English, char set = Windows, Multilingual + + BEGIN + VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" + VALUE "FileVersion", "1.2.4.0\0" + VALUE "InternalName", "zlib\0" + VALUE "OriginalFilename", "zlib.dll\0" + VALUE "ProductName", "ZLib.DLL\0" + VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" + VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END +END -- cgit v1.2.3