diff options
author | Yasha Jannoo <alledodo@gmail.com> | 2019-09-14 12:15:04 +0100 |
---|---|---|
committer | Yasha Jannoo <alledodo@gmail.com> | 2019-09-14 12:51:21 +0100 |
commit | f2e1338eba568ac7caa0051d57f1f6a10ae81801 (patch) | |
tree | 4a6589fb83fe95308b75a76505d97a972f2bd7be /zlib/contrib/vstudio/vc14/zlib.rc | |
parent | e31b0c1803d976e29b258c7307e32fd0d63821e5 (diff) | |
download | starshatter-f2e1338eba568ac7caa0051d57f1f6a10ae81801.zip starshatter-f2e1338eba568ac7caa0051d57f1f6a10ae81801.tar.gz starshatter-f2e1338eba568ac7caa0051d57f1f6a10ae81801.tar.bz2 |
Update zlib 3rd party code to v1.2.11
zlib source code, version 1.2.11. https://www.zlib.net/.
Include all the gynmastics involved in:
- making sure we compile zlibstat and set the output files locations and filename to those expected by the starshatter setup.
- turning off the ASM includes as they are invalid for the new versions of zlib (and crash when running).
- matching the calling conventions of the Starshatter code by ommiting ZLIB_WINAPI from the zlib preprocessor defines.
- fix debug build compile error in zlibstatic:
https://stackoverflow.com/questions/31867018/unresolved-external-symbol-except-handler4-common-in-visual-studio-2015
This fixes some string warnings.
Diffstat (limited to 'zlib/contrib/vstudio/vc14/zlib.rc')
-rw-r--r-- | zlib/contrib/vstudio/vc14/zlib.rc | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/zlib/contrib/vstudio/vc14/zlib.rc b/zlib/contrib/vstudio/vc14/zlib.rc new file mode 100644 index 0000000..c4e4b01 --- /dev/null +++ b/zlib/contrib/vstudio/vc14/zlib.rc @@ -0,0 +1,32 @@ +#include <windows.h> + +#define IDR_VERSION1 1 +IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE + FILEVERSION 1, 2, 11, 0 + PRODUCTVERSION 1, 2, 11, 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.11\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" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END +END |