diff --git a/src/libraries/Native/AnyOS/zlib/pal_zlib.c b/src/libraries/Native/AnyOS/zlib/pal_zlib.c
index aa4dcdca8a29e8..4d0b05c6629fa5 100644
--- a/src/libraries/Native/AnyOS/zlib/pal_zlib.c
+++ b/src/libraries/Native/AnyOS/zlib/pal_zlib.c
@@ -7,6 +7,9 @@
#ifdef _WIN32
#define c_static_assert(e) static_assert((e),"")
+#endif
+
+#if defined(_WIN32) || defined(__EMSCRIPTEN__)
#include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
#else
#include "pal_utilities.h"
diff --git a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
index f68e1acef69b00..89c20051c895cd 100644
--- a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
@@ -1,9 +1,5 @@
project(System.IO.Compression.Native C)
-if (CLR_CMAKE_TARGET_BROWSER)
- add_definitions(-s USE_ZLIB)
-endif()
-
include(${CMAKE_CURRENT_LIST_DIR}/extra_libs.cmake)
set(NATIVE_LIBS_EXTRA)
@@ -13,7 +9,21 @@ set(NATIVECOMPRESSION_SOURCES
../../AnyOS/zlib/pal_zlib.c
)
-if (NOT CLR_CMAKE_TARGET_BROWSER)
+if (CLR_CMAKE_TARGET_BROWSER)
+ set (NATIVECOMPRESSION_SOURCES
+ ${NATIVECOMPRESSION_SOURCES}
+ ../../Windows/System.IO.Compression.Native/zlib/adler32.c
+ ../../Windows/System.IO.Compression.Native/zlib/compress.c
+ ../../Windows/System.IO.Compression.Native/zlib/crc32.c
+ ../../Windows/System.IO.Compression.Native/zlib/deflate.c
+ ../../Windows/System.IO.Compression.Native/zlib/inffast.c
+ ../../Windows/System.IO.Compression.Native/zlib/inflate.c
+ ../../Windows/System.IO.Compression.Native/zlib/inftrees.c
+ ../../Windows/System.IO.Compression.Native/zlib/trees.c
+ ../../Windows/System.IO.Compression.Native/zlib/zutil.c
+ )
+ set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
+else()
#Include Brotli include files
include_directories("../../AnyOS/brotli/include")
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index e7a38f7681c642..7b37edbdb7fdc2 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -82,7 +82,6 @@
<_EmccFlags Include="@(_EmccCommonFlags)" />
- <_EmccFlags Include="-s USE_ZLIB=1" />