Reuse zlib sources in mono

am11 · Nov 24, 2021 · 4cbed64 · 4cbed64
1 parent 4d8a57f
commit 4cbed64
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 11,508 deletions.
diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt
@@ -47,7 +47,32 @@ include(../utils/CMakeLists.txt)
 include(../metadata/CMakeLists.txt)
 include(../sgen/CMakeLists.txt)
 if(INTERNAL_ZLIB)  # TODO: hook up HAVE_SYS_ZLIB instead
-  include(../zlib/CMakeLists.txt)
+  set(zlib_sources_base
+    adler32.c
+    compress.c
+    crc32.c
+    uncompr.c
+    deflate.c
+    gzguts.h
+    trees.c
+    zutil.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    crc32.h
+    deflate.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zconf.h
+    zlib.h
+    zutil.h
+  )
+
+  addprefix(zlib_sources ${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native/zlib "${zlib_sources_base}")
 endif()
 include(../component/CMakeLists.txt)
 

diff --git a/src/mono/mono/zlib/.gitignore b/src/mono/mono/zlib/.gitignore
diff --git a/src/mono/mono/zlib/CMakeLists.txt b/src/mono/mono/zlib/CMakeLists.txt
diff --git a/src/mono/mono/zlib/adler32.c b/src/mono/mono/zlib/adler32.c
diff --git a/src/mono/mono/zlib/compress.c b/src/mono/mono/zlib/compress.c