diff options
| author | Cary Coutant <ccoutant@google.com> | 2012-03-09 11:50:43 -0800 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2012-03-09 11:50:43 -0800 |
| commit | 4ed2fc3a6bbaaf1f2ea4d1c077dc7fa0867cd005 (patch) | |
| tree | 7774dcb772ccc005c2fd8f8831dc45b90a8f6060 /zlib/win32/zlib1.rc | |
| parent | 2400d467a903f32c96df9f9fcb0de7be8a655afa (diff) | |
| parent | f9c681635d1850543f547fdbb6efd5a010aca015 (diff) | |
| download | gcc-4ed2fc3a6bbaaf1f2ea4d1c077dc7fa0867cd005.tar.gz | |
Merge branch 'master' into google-debugfission
Diffstat (limited to 'zlib/win32/zlib1.rc')
| -rw-r--r-- | zlib/win32/zlib1.rc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/zlib/win32/zlib1.rc b/zlib/win32/zlib1.rc index 99025c97422..0d1d7ffcf70 100644 --- a/zlib/win32/zlib1.rc +++ b/zlib/win32/zlib1.rc @@ -1,19 +1,20 @@ -#include <windows.h> +#include <winver.h> +#include "../zlib.h" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO #else VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE #endif - FILEVERSION 1,2,2,0 - PRODUCTVERSION 1,2,2,0 + FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 + PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS 1 #else FILEFLAGS 0 #endif - FILEOS VOS_DOS_WINDOWS32 + FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL FILESUBTYPE 0 // not used BEGIN @@ -23,13 +24,13 @@ BEGIN //language ID = U.S. English, char set = Windows, Multilingual BEGIN VALUE "FileDescription", "zlib data compression library\0" - VALUE "FileVersion", "1.2.3\0" + VALUE "FileVersion", ZLIB_VERSION "\0" VALUE "InternalName", "zlib1.dll\0" - VALUE "LegalCopyright", "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2006 Jean-loup Gailly & Mark Adler\0" VALUE "OriginalFilename", "zlib1.dll\0" VALUE "ProductName", "zlib\0" - VALUE "ProductVersion", "1.2.3\0" - VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" + VALUE "ProductVersion", ZLIB_VERSION "\0" + VALUE "Comments", "For more information visit http://www.zlib.net/\0" END END BLOCK "VarFileInfo" |