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/contrib/masmx86/bld_ml32.bat | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 zlib/contrib/masmx86/bld_ml32.bat (limited to 'zlib/contrib/masmx86/bld_ml32.bat') diff --git a/zlib/contrib/masmx86/bld_ml32.bat b/zlib/contrib/masmx86/bld_ml32.bat new file mode 100644 index 0000000..67e6a6a --- /dev/null +++ b/zlib/contrib/masmx86/bld_ml32.bat @@ -0,0 +1,2 @@ +ml /safeseh /coff /Zi /c /Flmatch686.lst match686.asm +ml /safeseh /coff /Zi /c /Flinffas32.lst inffas32.asm -- cgit v1.1