Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/msvc
diff options
context:
space:
mode:
authorJay Krell <jaykrell@microsoft.com>2019-07-31 23:56:34 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2019-07-31 23:56:34 +0300
commit431bb95c715abd830a5cfd3e9c37cf79f863cf45 (patch)
tree8b8e407ed46a01155737ce3711840521592095c0 /msvc
parent1d9a87e449d4badaab86c989b92f3dc9ab792f9c (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')
-rw-r--r--msvc/monoposixhelper.targets1
-rw-r--r--msvc/monoposixhelper.targets.filters3
-rw-r--r--msvc/monozlib.targets14
3 files changed, 16 insertions, 2 deletions
diff --git a/msvc/monoposixhelper.targets b/msvc/monoposixhelper.targets
index 63b2e0085ee..e56d0fb2fc9 100644
--- a/msvc/monoposixhelper.targets
+++ b/msvc/monoposixhelper.targets
@@ -29,6 +29,7 @@
<ClInclude Include="$(MonoSourceLocation)\support\inffast.h" />
<ClInclude Include="$(MonoSourceLocation)\support\crc32.h" />
<ClInclude Include="$(MonoSourceLocation)\support\deflate.h" />
+ <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h" />
<ClInclude Include="$(MonoSourceLocation)\support\inffixed.h" />
<ClInclude Include="$(MonoSourceLocation)\support\inflate.h" />
<ClInclude Include="$(MonoSourceLocation)\support\inftrees.h" />
diff --git a/msvc/monoposixhelper.targets.filters b/msvc/monoposixhelper.targets.filters
index 0d5393de0c4..9189d646ac2 100644
--- a/msvc/monoposixhelper.targets.filters
+++ b/msvc/monoposixhelper.targets.filters
@@ -78,6 +78,9 @@
<ClInclude Include="$(MonoSourceLocation)\support\deflate.h">
<Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
</ClInclude>
+ <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h">
+ <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
+ </ClInclude>
<ClInclude Include="$(MonoSourceLocation)\support\inffast.h">
<Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
</ClInclude>
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>