diff options
| author | Jay Krell <jaykrell@microsoft.com> | 2019-07-05 15:38:56 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-05 15:38:56 +0300 |
| commit | b84b85688ba252d1e514ff2dec6a3d10544caa8c (patch) | |
| tree | 26be7d2f40eb80533f8e56a329f830085fd634de /msvc | |
| parent | 063985e04d08dbbed358c000d09b0d7b901f86f9 (diff) | |
Win32 zlib support. (#15509)
Fixes https://github.com/mono/mono/issues/15503
Always statically link on Windows (msvc and mingw).
This is a somewhat old zlib, and will be updated shortly (https://github.com/mono/mono/pull/15480)
Note that zlib is not valid C++, so always compile as C.
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/libmonoruntime.targets | 1 | ||||
| -rw-r--r-- | msvc/monozlib.targets | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/msvc/libmonoruntime.targets b/msvc/libmonoruntime.targets index 3dcf845605a..b4b95833ebb 100644 --- a/msvc/libmonoruntime.targets +++ b/msvc/libmonoruntime.targets @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildThisFileDirectory)monozlib.targets" />
<Import Project="$(MSBuildThisFileDirectory)libmonoruntime-common.targets" /> <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-win32.targets" /> <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-posix.targets" /> diff --git a/msvc/monozlib.targets b/msvc/monozlib.targets new file mode 100644 index 00000000000..1dca70ce59d --- /dev/null +++ b/msvc/monozlib.targets @@ -0,0 +1,30 @@ +<?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">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\crc32.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\deflate.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\inffast.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\inflate.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\inftrees.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\trees.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="$(MonoSourceLocation)\support\zutil.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ </ItemGroup> +</Project> |