diff options
| author | Jay Krell <jaykrell@microsoft.com> | 2019-07-31 23:56:34 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-31 23:56:34 +0300 |
| commit | 431bb95c715abd830a5cfd3e9c37cf79f863cf45 (patch) | |
| tree | 8b8e407ed46a01155737ce3711840521592095c0 /msvc/monozlib.targets | |
| parent | 1d9a87e449d4badaab86c989b92f3dc9ab792f9c (diff) | |
Update zlib from 1.2.5 to 1.2.11. (#15480)
Circa 2010 to circa 2017.
Retrieved with apt-get source zlib on WSL Ubuntu 18.04.2 LTS.
This matches Debian or Ubuntu (they differ by one commit, and one of them restores a dummy function for compat).
---
* [minizip] Ensure we don't ever accidentally change calling convention
Make sure we always #define ZCALLBACK to empty so we don't change
the calling convention on windows by including a header which defines
'CALLBACK'. This will keep things as cdecl as required by the c#
pinvokes.
* Update zlib readme.
* Update zlib from 1.2.5 to 1.2.11.
* [zlib] Small fix for Visual C++.
see https://github.com/madler/zlib/pull/435/files#diff-0558e84b0c24a83ca790dcb05cd26212R1087
and https://github.com/madler/zlib/pull/435/files#diff-0558e84b0c24a83ca790dcb05cd26212R1104
* Add gzguts.h to Makefiles.
* Add .h files to Visual Studio project files just for GUI purposes.
Diffstat (limited to 'msvc/monozlib.targets')
| -rw-r--r-- | msvc/monozlib.targets | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/msvc/monozlib.targets b/msvc/monozlib.targets index 1dca70ce59d..fddb369dea1 100644 --- a/msvc/monozlib.targets +++ b/msvc/monozlib.targets @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="monozlib"> - <ClCompile
- Include="$(MonoSourceLocation)\support\adler32.c">
+ <ClCompile Include="$(MonoSourceLocation)\support\adler32.c">
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="$(MonoSourceLocation)\support\crc32.c">
@@ -26,5 +25,16 @@ <ClCompile Include="$(MonoSourceLocation)\support\zutil.c">
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
+ <ClInclude Include="$(MonoSourceLocation)\support\crc32.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\deflate.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\inffast.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\inffixed.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\inflate.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\inftrees.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\trees.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\zconf.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\zutil.h"/>
+ <ClInclude Include="$(MonoSourceLocation)\support\zlib.h"/>
</ItemGroup> </Project> |