Skip to content

Commit a5a0004

Browse files
authored
[wasm] Remove USE_ZLIB=1 and include the sources instead (#64907)
1 parent 826c3d7 commit a5a0004

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

src/libraries/Native/AnyOS/zlib/pal_zlib.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
#ifdef _WIN32
99
#define c_static_assert(e) static_assert((e),"")
10+
#endif
11+
12+
#if defined(_WIN32) || defined(__EMSCRIPTEN__)
1013
#include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
1114
#else
1215
#include "pal_utilities.h"

src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
project(System.IO.Compression.Native C)
22

3-
if (CLR_CMAKE_TARGET_BROWSER)
4-
add_definitions(-s USE_ZLIB)
5-
endif()
6-
73
include(${CMAKE_CURRENT_LIST_DIR}/extra_libs.cmake)
84

95
set(NATIVE_LIBS_EXTRA)
@@ -13,7 +9,21 @@ set(NATIVECOMPRESSION_SOURCES
139
../../AnyOS/zlib/pal_zlib.c
1410
)
1511

16-
if (NOT CLR_CMAKE_TARGET_BROWSER)
12+
if (CLR_CMAKE_TARGET_BROWSER)
13+
set (NATIVECOMPRESSION_SOURCES
14+
${NATIVECOMPRESSION_SOURCES}
15+
../../Windows/System.IO.Compression.Native/zlib/adler32.c
16+
../../Windows/System.IO.Compression.Native/zlib/compress.c
17+
../../Windows/System.IO.Compression.Native/zlib/crc32.c
18+
../../Windows/System.IO.Compression.Native/zlib/deflate.c
19+
../../Windows/System.IO.Compression.Native/zlib/inffast.c
20+
../../Windows/System.IO.Compression.Native/zlib/inflate.c
21+
../../Windows/System.IO.Compression.Native/zlib/inftrees.c
22+
../../Windows/System.IO.Compression.Native/zlib/trees.c
23+
../../Windows/System.IO.Compression.Native/zlib/zutil.c
24+
)
25+
set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
26+
else()
1727
#Include Brotli include files
1828
include_directories("../../AnyOS/brotli/include")
1929

src/mono/wasm/wasm.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282

8383
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
8484
<_EmccFlags Include="@(_EmccCommonFlags)" />
85-
<_EmccFlags Include="-s USE_ZLIB=1" />
8685
</ItemGroup>
8786

8887
<WriteLinesToFile File="$(_EmccDefaultsRspPath)"

0 commit comments

Comments
 (0)