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.vcxproj | 566 ------------------------------------------------------ 1 file changed, 566 deletions(-) delete mode 100644 zlib/Zlib.vcxproj (limited to 'zlib/Zlib.vcxproj') diff --git a/zlib/Zlib.vcxproj b/zlib/Zlib.vcxproj deleted file mode 100644 index 9cad8a6..0000000 --- a/zlib/Zlib.vcxproj +++ /dev/null @@ -1,566 +0,0 @@ - - - - - Debug VS2012 - Win32 - - - Debug VS2012 - x64 - - - Debug x64 - Win32 - - - Debug x64 - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release VS2012 - Win32 - - - Release VS2012 - x64 - - - Release x64 - Win32 - - - Release x64 - x64 - - - Release - Win32 - - - Release - x64 - - - Template - Win32 - - - Template - x64 - - - - - - {0F2DDC75-EE37-902B-0247-63A8EB8CD687} - 10.0.16299.0 - - - - Application - v141 - - - Application - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - v141 - - - v141 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .\Debug\ - .\Debug\ - - - .\Debug\ - .\Debug\ - - - .\Debug\ - .\Debug\ - - - .\Debug\ - .\Debug\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - false - ProgramDatabase - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\Zlib.pch - .\Debug\ - .\Debug\ - EnableFastChecks - true - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\Zlib.bsc - - - true - .\Debug\Zlib.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - false - ProgramDatabase - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\Zlib.pch - .\Debug\ - .\Debug\ - EnableFastChecks - true - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\Zlib.bsc - - - true - .\Debug\Zlib.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - ProgramDatabase - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\Zlib.pch - .\Debug\ - .\Debug\ - EnableFastChecks - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\Zlib.bsc - - - true - .\Debug\Zlib.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - ProgramDatabase - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\Zlib.pch - .\Debug\ - .\Debug\ - EnableFastChecks - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\Zlib.bsc - - - true - .\Debug\Zlib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - false - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\Zlib.pch - .\Release\ - .\Release\ - true - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Zlib.bsc - - - true - .\Release\Zlib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - false - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\Zlib.pch - .\Release\ - .\Release\ - true - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Zlib.bsc - - - true - .\Release\Zlib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - false - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\Zlib.pch - .\Release\ - .\Release\ - true - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Zlib.bsc - - - true - .\Release\Zlib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\Zlib.pch - .\Release\ - .\Release\ - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Zlib.bsc - - - true - .\Release\Zlib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\Zlib.pch - .\Release\ - .\Release\ - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Zlib.bsc - - - true - .\Release\Zlib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\Zlib.pch - .\Release\ - .\Release\ - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Zlib.bsc - - - true - .\Release\Zlib.lib - - - - - true - false - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.1