From f2e1338eba568ac7caa0051d57f1f6a10ae81801 Mon Sep 17 00:00:00 2001 From: Yasha Jannoo Date: Sat, 14 Sep 2019 12:15:04 +0100 Subject: 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. --- zlib/Zlib.plg | 68 ----------------------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 zlib/Zlib.plg (limited to 'zlib/Zlib.plg') diff --git a/zlib/Zlib.plg b/zlib/Zlib.plg deleted file mode 100644 index 1129185..0000000 --- a/zlib/Zlib.plg +++ /dev/null @@ -1,68 +0,0 @@ - - -
-

Build Log

-

---------------------Configuration: Zlib - Win32 Release-------------------- -

-

Command Lines

-Creating temporary file "H:\TMP\RSP85.tmp" with contents -[ -/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"Release/Zlib.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c -"C:\GameDev\Zlib\adler32.c" -"C:\GameDev\Zlib\compress.c" -"C:\GameDev\Zlib\crc32.c" -"C:\GameDev\Zlib\deflate.c" -"C:\GameDev\Zlib\gzio.c" -"C:\GameDev\Zlib\infback.c" -"C:\GameDev\Zlib\inffast.c" -"C:\GameDev\Zlib\inflate.c" -"C:\GameDev\Zlib\inftrees.c" -"C:\GameDev\Zlib\minigzip.c" -"C:\GameDev\Zlib\trees.c" -"C:\GameDev\Zlib\uncompr.c" -"C:\GameDev\Zlib\zutil.c" -] -Creating command line "cl.exe @H:\TMP\RSP85.tmp" -Creating temporary file "H:\TMP\RSP86.tmp" with contents -[ -/nologo /out:"Release\Zlib.lib" -.\Release\adler32.obj -.\Release\compress.obj -.\Release\crc32.obj -.\Release\deflate.obj -.\Release\gzio.obj -.\Release\infback.obj -.\Release\inffast.obj -.\Release\inflate.obj -.\Release\inftrees.obj -.\Release\minigzip.obj -.\Release\trees.obj -.\Release\uncompr.obj -.\Release\zutil.obj -] -Creating command line "link.exe -lib @H:\TMP\RSP86.tmp" -

Output Window

-Compiling... -adler32.c -compress.c -crc32.c -deflate.c -gzio.c -infback.c -inffast.c -inflate.c -inftrees.c -minigzip.c -trees.c -uncompr.c -zutil.c -Creating library... - - - -

Results

-Zlib.lib - 0 error(s), 0 warning(s) -
- - -- cgit v1.1